commit 3a37a0cefd7599fa769fd86f7d64d781aaa88be7
author Bart Sears <bsears@google.com> Sun Nov 15 17:59:32 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sun Nov 15 17:59:32 2015 +0000
tree 7a7bb6361090da6ab3f0777c166c187d0eb31ca9
parent ba740ff57fd314d0ad649c252841ab834e96fdaa
parent 970f203b3d3f17b778749c3ce47eb6b922aa606c

Change version back to 6.0
am: 970f203b3d

* commit '970f203b3d3f17b778749c3ce47eb6b922aa606c':
  Change version back to 6.0

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index a67a82e..a130799 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -42,7 +42,7 @@
   # 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 @@
   # 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)"