diff options
| author | Zach Jang <zachjang@google.com> | 2016-06-22 01:33:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 01:33:23 +0000 |
| commit | 9fc3cf7ba21d0877372f682a6a0c7db2a2294c1c (patch) | |
| tree | d3a7de1db462ecfa002e5846f50761eab1765808 | |
| parent | bf5d08ecf4cce47611ee58dbe6b0685e04725c87 (diff) | |
| parent | cbf1e2cc945ca1a5d70b6e8c213c4c7a428b9090 (diff) | |
| download | build-9fc3cf7ba21d0877372f682a6a0c7db2a2294c1c.tar.gz | |
resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29
am: cbf1e2cc94
Change-Id: I72cff95d6f8878b5d3707f0b0f9c0541c89b9aa5
| -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 18f847fa14..c88c0c9961 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,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 := 2016-07-05 + PLATFORM_SECURITY_PATCH := 2016-08-05 endif ifeq "" "$(PLATFORM_BASE_OS)" |