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

resolved conflicts for merge of 32c5f299 to master

Browse Source 
Change-Id: I72656792e109fea82c63a3a42151c024630f5997
This commit is contained in:
Justin Koh
2014-05-13 16:52:17 -07:00
parent 11d0415481 32c5f2998f
commit fc986d71ca
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -19644,7 +19644,7 @@ package android.os {
field public static final int JELLY_BEAN_MR1 = 17; // 0x11
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 = 10000; // 0x2710
field public static final int KITKAT_WATCH = 20; // 0x14
field public static final int L = 10000; // 0x2710
}

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

@@ -515,9 +515,16 @@ public class Build {
public static final int KITKAT = 19;
/**
* Android 4.5: KitKat for watches, snacks on the run.
* Android 4.4W: KitKat for watches, snacks on the run.
*
* <p>Applications targeting this or a later release will get these
* new changes in behavior:</p>
* <ul>
* <li>{@link android.app.AlertDialog} might not have a default background if the theme does
* not specify one.</li>
* </ul>
*/
public static final int KITKAT_WATCH = CUR_DEVELOPMENT; // STOPSHIP: update API level
public static final int KITKAT_WATCH = 20;
/**
* L!