diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-31 19:42:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 19:42:26 +0000 |
| commit | 4b4244cb03bb6f5339859c4631717fe0ddeec4e8 (patch) | |
| tree | 47411e457df7f652d877a3c693a6d98ef0c65e36 /core | |
| parent | d9bb53f965caa4f961b822e63c486c2863b29a7c (diff) | |
| parent | 56866c4d0e31bbc65e333754bb69accb2b0f4a36 (diff) | |
| download | build-4b4244cb03bb6f5339859c4631717fe0ddeec4e8.zip build-4b4244cb03bb6f5339859c4631717fe0ddeec4e8.tar.gz build-4b4244cb03bb6f5339859c4631717fe0ddeec4e8.tar.bz2 | |
am 56866c4d: Merge "Remove M codename, version number is 6.0." into mnc-dev
* commit '56866c4d0e31bbc65e333754bb69accb2b0f4a36':
Remove M codename, version number is 6.0.
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 c481bbc..e88623e 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 := M + PLATFORM_VERSION := 6.0 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 := MNC + PLATFORM_VERSION_CODENAME := REL # This is all of the development codenames that are active. Should be either # the same as PLATFORM_VERSION_CODENAME or a comma-separated list of additional |