Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c707f043 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

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

* commit 'd5f387bc':
  Looks like MNC is gonna be API 23.
parents 7a5cc8b3 d5f387bc

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -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 {

























api/system-current.txt



+1
−1




























Original line number
Diff line number
Diff line








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

























core/java/android/os/Build.java



+1
−1




























Original line number
Diff line number
Diff line








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