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/java/android/os | |
| 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/java/android/os')
| -rw-r--r-- | core/java/android/os/Build.java | 2 | ||||
| -rw-r--r-- | core/java/android/os/UserManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index b2ced7f..a0162f7 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -622,7 +622,7 @@ public class Build { /** * M comes after L. */ - public static final int MNC = 23; + public static final int M = 23; } /** The type of build, like "user" or "eng". */ diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 79fb805..83a1993 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -180,7 +180,7 @@ public class UserManager { * Specifies if a user is disallowed from configuring VPN. * The default value is <code>false</code>. * This restriction has an effect in a managed profile only from - * {@link android.os.Build.VERSION_CODES#MNC} + * {@link android.os.Build.VERSION_CODES#M} * * <p/>Key for user restrictions. * <p/>Type: Boolean |