diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-31 19:42:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-31 19:42:11 +0000 |
| commit | 9b36f526dd0378bda8f71c0e51ed37bf97742f8f (patch) | |
| tree | 7b7202a361e46f17a42ef92ed378f4cce5de6636 /core/res | |
| parent | f1518da4512dcf350fd808a5288634f534bca1bb (diff) | |
| parent | c1836bb0f1bf3e5ef0911719525da0bab3e53507 (diff) | |
| download | frameworks_base-9b36f526dd0378bda8f71c0e51ed37bf97742f8f.zip frameworks_base-9b36f526dd0378bda8f71c0e51ed37bf97742f8f.tar.gz frameworks_base-9b36f526dd0378bda8f71c0e51ed37bf97742f8f.tar.bz2 | |
am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev
* commit 'c1836bb0f1bf3e5ef0911719525da0bab3e53507':
Change MNC codename to just M.
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/attrs_manifest.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml index 1515703..de16f20 100644 --- a/core/res/res/values/attrs_manifest.xml +++ b/core/res/res/values/attrs_manifest.xml @@ -219,7 +219,7 @@ <flag name="appop" value="0x40" /> <!-- Additional flag from base permission type: this permission can be automatically granted to apps that target API levels below - {@link android.os.Build.VERSION_CODES#MNC} (before runtime permissions + {@link android.os.Build.VERSION_CODES#M} (before runtime permissions were introduced). --> <flag name="pre23" value="0x80" /> <!-- Additional flag from base permission type: this permission can be automatically @@ -1059,7 +1059,7 @@ at the same time. <p>The default value is <code>false</code> for applications with - <code>targetSdkVersion</code> lesser than {@link android.os.Build.VERSION_CODES#MNC} and + <code>targetSdkVersion</code> lesser than {@link android.os.Build.VERSION_CODES#M} and <code>true</code> otherwise. <p>NOTE: A task's root activity value is applied to all additional activities launched in diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 85b6c12..bc831da 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2604,7 +2604,7 @@ <public type="style" name="Theme.DeviceDefault.Light.Dialog.Alert" /> <!-- =============================================================== - Resources added in version MNC of the platform + Resources added in version M of the platform =============================================================== --> <eat-comment /> |