diff options
author | Dianne Hackborn <hackbod@google.com> | 2011-11-14 13:14:25 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-11-14 13:14:25 -0800 |
commit | 227b9f8b9b5f5041b79b1e33a8d5815b1458d886 (patch) | |
tree | 2b6080baef802b3cd8c0b4a1d5829054a8955add /core | |
parent | 9b856464ce59b73c101451eab4c3842570bca002 (diff) | |
parent | 6e4e1bbbc1f3e3c8e53940ffec24da9d1be4ff25 (diff) | |
download | build-227b9f8b9b5f5041b79b1e33a8d5815b1458d886.zip build-227b9f8b9b5f5041b79b1e33a8d5815b1458d886.tar.gz build-227b9f8b9b5f5041b79b1e33a8d5815b1458d886.tar.bz2 |
Merge "Dev branch for ICS MR2."
Diffstat (limited to 'core')
-rw-r--r-- | core/version_defaults.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 7f6db0c..8553982 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -41,7 +41,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 := 4.1 + PLATFORM_VERSION := IceCreamSandwichMR2 endif ifeq "" "$(PLATFORM_SDK_VERSION)" @@ -59,7 +59,7 @@ endif ifeq "" "$(PLATFORM_VERSION_CODENAME)" # This is the current development code-name, if the build is not a final # release build. If this is a final release build, it is simply "REL". - PLATFORM_VERSION_CODENAME := REL + PLATFORM_VERSION_CODENAME := IceCreamSandwichMR2 endif ifeq "" "$(DEFAULT_APP_TARGET_SDK)" |