commit 06581f3f89ab131eb3f3dd2da4a7f0709b9e1e6f
author Bart Sears <bsears@google.com> Sat Nov 14 23:50:18 2015 -0800
committer The Android Automerger <android-build@android.com> Wed Nov 18 16:33:05 2015 -0800
tree 274ca8035ba893f4ac9805e3f86466b3f7c50665
parent 27fdf2c8e5ddf07d97448c7a8c9adcf9083c55bb

Change version back to 6.0

Temporarily set the version back to 6.0 and security patch to
2015-11-01.

Change-Id: Idb09d6bab89362b18ae9657e3ed931d614c1894b

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)"