diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-07-31 17:11:58 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-31 17:11:58 +0000 |
| commit | c1836bb0f1bf3e5ef0911719525da0bab3e53507 (patch) | |
| tree | 616e87b836bf7dc35558971d19743a467e4e665f /api | |
| parent | d0694da4fb85bb01e7c0ea7989a78a0e635453ac (diff) | |
| parent | 0e3de6cacaffcfeda4d6353be61e2f1f9ed80705 (diff) | |
| download | frameworks_base-c1836bb0f1bf3e5ef0911719525da0bab3e53507.zip frameworks_base-c1836bb0f1bf3e5ef0911719525da0bab3e53507.tar.gz frameworks_base-c1836bb0f1bf3e5ef0911719525da0bab3e53507.tar.bz2 | |
Merge "Change MNC codename to just M." into mnc-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 01a260c..68ecf96 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22704,7 +22704,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 = 23; // 0x17 + field public static final int M = 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 f371ff8..2e0613a 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -24650,7 +24650,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 = 23; // 0x17 + field public static final int M = 23; // 0x17 } public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { |