diff options
author | Bart Sears <bsears@google.com> | 2015-11-15 18:02:26 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-11-15 18:02:26 +0000 |
commit | e373f066fbc4b96fd836d3a6e08e582ece8a0a2d (patch) | |
tree | 7a7bb6361090da6ab3f0777c166c187d0eb31ca9 | |
parent | 796f0003464da70f42346a0240fe8d4142706ff1 (diff) | |
parent | 3a37a0cefd7599fa769fd86f7d64d781aaa88be7 (diff) | |
download | build-e373f066fbc4b96fd836d3a6e08e582ece8a0a2d.tar.gz |
Change version back to 6.0 am: 970f203b3d
am: 3a37a0cefd
* commit '3a37a0cefd7599fa769fd86f7d64d781aaa88be7':
Change version back to 6.0
-rw-r--r-- | core/version_defaults.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/version_defaults.mk b/core/version_defaults.mk index a67a82ea0e..a130799fd6 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -42,7 +42,7 @@ ifeq "" "$(PLATFORM_VERSION)" # which is the version that we reveal to the end user. # Update this value when the platform version changes (rather # than overriding it somewhere else). Can be an arbitrary string. - PLATFORM_VERSION := 6.0.1 + PLATFORM_VERSION := 6.0 endif ifeq "" "$(PLATFORM_SDK_VERSION)" @@ -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 := 2015-12-01 + PLATFORM_SECURITY_PATCH := 2015-11-01 endif ifeq "" "$(PLATFORM_BASE_OS)" |