diff options
| author | Zach Jang <zachjang@google.com> | 2016-06-22 01:41:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 01:41:13 +0000 |
| commit | 1be6c6952400d047de8ecf99c84efedb34edcaa0 (patch) | |
| tree | e3d6ed2296d9357466d171e410924ded1424fc5f | |
| parent | 9f527d52229c973fddd94b926b803a6be68ae440 (diff) | |
| parent | e7bc1542dbdd76282ad2e37e0ae7ee57e75b723c (diff) | |
| download | build-1be6c6952400d047de8ecf99c84efedb34edcaa0.tar.gz | |
resolve merge conflicts of 12db224 to lmp-mr1-dev am: 0c672afc40 am: cf51c6cb29 am: cbf1e2cc94 am: 9fc3cf7ba2 am: 3749025ccb
am: e7bc1542db
Change-Id: I316c25839b0e111bda05ba586733e3712eda5a32
| -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 cb8ba51483..d90f3dc9cf 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)" |