diff options
| author | Zach Jang <zachjang@google.com> | 2016-06-21 18:13:17 -0700 |
|---|---|---|
| committer | Zach Jang <zachjang@google.com> | 2016-06-21 18:13:17 -0700 |
| commit | 12db22426993ccd0470f551c8ac05fbdbf0e9447 (patch) | |
| tree | 8b3dd59cc8fe096096d2ebdb520654e9ba775930 | |
| parent | 79770b192771b7e332f1537fef3e3719b07bcf14 (diff) | |
| parent | 24cfbfabb760c366c3e8f6bff921d3d9a977adcf (diff) | |
| download | build-12db22426993ccd0470f551c8ac05fbdbf0e9447.tar.gz | |
resolve merge conflicts of 24cfbfa to lmp-dev
Change-Id: I5a634582647d154238c5d5bc07ccf1d0fa869132
| -rw-r--r-- | core/version_defaults.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 924a07c03f..700f187f43 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -73,7 +73,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2015-11-01 + PLATFORM_SECURITY_PATCH := 2016-08-05 endif ifeq "" "$(PLATFORM_BASE_OS)" |