commit 1a4deadf349b388064f52c0ebdf78ae0d75f52cb
author Bart Sears <bsears@google.com> Sun Nov 15 18:05:17 2015 +0000
committer android-build-merger <android-build-merger@google.com> Sun Nov 15 18:05:17 2015 +0000
tree ea08400c503592f34de5b41cce0cf2f0803b91ca
parent d30b162002e3b2165a89eadd34c2ae7c478f1879
parent 7b67e0dd73766dcceb77fa08ae2d8da1341b3c87

Revert "Change version back to 6.0" am: 55a149b740 am: 550b317688
am: 7b67e0dd73

* commit '7b67e0dd73766dcceb77fa08ae2d8da1341b3c87':
  Revert "Change version back to 6.0"

core/version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 39760dc..d035036 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
+  PLATFORM_VERSION := 6.0.1
 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-11-01
+  PLATFORM_SECURITY_PATCH := 2015-12-01
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"