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

am c5e138f7: Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev

Browse Source 
* commit 'c5e138f774ca46cf2f2fb58a040c2f91685d00cf':
  Fix issue #17375172...   sshhhhhh!!!
This commit is contained in:
Dianne Hackborn
2014-09-04 23:18:15 +00:00
committed by Android Git Automerger
parent de40d8e57f edfc6af590
commit 8e132e0f4f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -21563,7 +21563,7 @@ package android.os {
field public static final int JELLY_BEAN_MR2 = 18; // 0x12
field public static final int KITKAT = 19; // 0x13
field public static final int KITKAT_WATCH = 20; // 0x14
field public static final int L = 10000; // 0x2710
field public static final int L = 21; // 0x15
}
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {

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

@@ -541,7 +541,7 @@ public class Build {
* Intent.</li>
* </ul>
*/
public static final int L = CUR_DEVELOPMENT;
public static final int L = 21;
}
/** The type of build, like "user" or "eng". */