summaryrefslogtreecommitdiffstats
path: root/core/version_defaults.mk
diff options
context:
space:
mode:
authorBart Sears <bsears@google.com>2015-11-15 17:57:13 +0000
committerThe Android Automerger <android-build@google.com>2015-11-17 10:58:13 -0800
commitf9afd24806565166d05352e197eeb8e01f8d2d8d (patch)
treeea74b35129bf0b514fbb298ef34af33db26f6c30 /core/version_defaults.mk
parent5263cbe94e94c36b4ed68a307d4d236ff8cb8b99 (diff)
downloadbuild-f9afd24806565166d05352e197eeb8e01f8d2d8d.zip
build-f9afd24806565166d05352e197eeb8e01f8d2d8d.tar.gz
build-f9afd24806565166d05352e197eeb8e01f8d2d8d.tar.bz2
Revert "Change version back to 6.0"
This reverts commit 970f203b3d3f17b778749c3ce47eb6b922aa606c. Change-Id: Icd96990f128e303b0e2af5af0f0d4a0f7731fe60
Diffstat (limited to 'core/version_defaults.mk')
-rw-r--r--core/version_defaults.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index a130799..a67a82e 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
+ PLATFORM_VERSION := 6.0.1
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-11-01
+ PLATFORM_SECURITY_PATCH := 2015-12-01
endif
ifeq "" "$(PLATFORM_BASE_OS)"