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

* commit '97abd672aaa041c34542d8bbededbe207798baee':
  Looks like MNC is gonna be API 23.
This commit is contained in:
Dianne Hackborn
2015-06-27 00:54:25 +00:00
committed by Android Git Automerger
3 changed files with 3 additions and 3 deletions

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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". */