commit d30b162002e3b2165a89eadd34c2ae7c478f1879
author Bart Sears <bsears@google.com> Sun Nov 15 18:05:09 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sun Nov 15 18:05:09 2015 +0000
tree 67fb29ddf01d6893f103a7f8adbfe6a64fc3ab64
parent 0cac39037d68e6efc9caa2745d1ff41e22c8f6a3
parent e373f066fbc4b96fd836d3a6e08e582ece8a0a2d

Change version back to 6.0 am: 970f203b3d am: 3a37a0cefd
am: e373f066fb

* commit 'e373f066fbc4b96fd836d3a6e08e582ece8a0a2d':
  Change version back to 6.0

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index d035036..39760dc 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -43,7 +43,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)"
@@ -104,7 +104,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)"