diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-31 17:37:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-31 17:37:50 +0000 |
| commit | 56866c4d0e31bbc65e333754bb69accb2b0f4a36 (patch) | |
| tree | c87958d7c1d2a728d7158fc6e36b9a36e104b8dd /core | |
| parent | 5915e57db504914c02d36e8f8cc18767c40f9c2d (diff) | |
| parent | 307631b057d4e4c0975c006fd4c7e94aa39138a0 (diff) | |
| download | build-56866c4d0e31bbc65e333754bb69accb2b0f4a36.zip build-56866c4d0e31bbc65e333754bb69accb2b0f4a36.tar.gz build-56866c4d0e31bbc65e333754bb69accb2b0f4a36.tar.bz2 | |
Merge "Remove M codename, version number is 6.0." into mnc-dev
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 |