diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-06-27 00:29:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-27 00:29:26 +0000 |
| commit | d5f387bc5f41dce790076ab5f6a242ec4f6cc792 (patch) | |
| tree | db9c988700535d76b9202a5aee2cea6a59eda810 | |
| parent | 627bd99ef617cfee67d44d186fa5d72380a6a4cf (diff) | |
| parent | 2e5cad786869b0e61ff06a430646682781162187 (diff) | |
| download | frameworks_base-d5f387bc5f41dce790076ab5f6a242ec4f6cc792.zip frameworks_base-d5f387bc5f41dce790076ab5f6a242ec4f6cc792.tar.gz frameworks_base-d5f387bc5f41dce790076ab5f6a242ec4f6cc792.tar.bz2 | |
Merge "Looks like MNC is gonna be API 23." into mnc-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | core/java/android/os/Build.java | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 33e4182..b609b83 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22700,7 +22700,7 @@ package android.os { field public static final int KITKAT_WATCH = 20; // 0x14 field public static final int LOLLIPOP = 21; // 0x15 field public static final int LOLLIPOP_MR1 = 22; // 0x16 - field public static final int MNC = 10000; // 0x2710 + field public static final int MNC = 23; // 0x17 } public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { diff --git a/api/system-current.txt b/api/system-current.txt index d862566..7e07e48 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -24647,7 +24647,7 @@ package android.os { field public static final int KITKAT_WATCH = 20; // 0x14 field public static final int LOLLIPOP = 21; // 0x15 field public static final int LOLLIPOP_MR1 = 22; // 0x16 - field public static final int MNC = 10000; // 0x2710 + field public static final int MNC = 23; // 0x17 } public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 50eed3e..b2ced7f 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 = CUR_DEVELOPMENT; + public static final int MNC = 23; } /** The type of build, like "user" or "eng". */ |