Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d5f387bc: Merge "Looks like MNC is gonna be API 23." into mnc-dev

Browse Source 
* commit 'd5f387bc5f41dce790076ab5f6a242ec4f6cc792':
  Looks like MNC is gonna be API 23.
This commit is contained in:
Dianne Hackborn
2015-06-27 00:38:52 +00:00
committed by Android Git Automerger
parent 5f8740c993 d5f387bc5f
commit 97abd672aa
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -22700,7 +22700,7 @@ package android.os {
field public static final int KITKAT_WATCH = 20; // 0x14 field public static final int KITKAT_WATCH = 20; // 0x14
field public static final int LOLLIPOP = 21; // 0x15 field public static final int LOLLIPOP = 21; // 0x15
field public static final int LOLLIPOP_MR1 = 22; // 0x16 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 { public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

2
api/system-current.txt
View File

@@ -24647,7 +24647,7 @@ package android.os {
field public static final int KITKAT_WATCH = 20; // 0x14 field public static final int KITKAT_WATCH = 20; // 0x14
field public static final int LOLLIPOP = 21; // 0x15 field public static final int LOLLIPOP = 21; // 0x15
field public static final int LOLLIPOP_MR1 = 22; // 0x16 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 { public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

2
core/java/android/os/Build.java
View File

@@ -622,7 +622,7 @@ public class Build {
/** /**
* M comes after L. * 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". */ /** The type of build, like "user" or "eng". */