diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-04-16 14:18:49 -0700 |
|---|---|---|
| committer | Jeff Brown <jeffbrown@google.com> | 2014-04-16 14:18:49 -0700 |
| commit | 047f3c71a48d90a2b022bd886bf581add2d68326 (patch) | |
| tree | 8e3c94eacf5fa0df69ad7ae996e81ec2d7e32835 /core/java/android | |
| parent | 2adb422928d35b34cfd8c52170e0df7ffc681816 (diff) | |
| parent | 3ee9dc58e5e1e39fac184b98cac0c7c46af72dd9 (diff) | |
| download | frameworks_base-047f3c71a48d90a2b022bd886bf581add2d68326.zip frameworks_base-047f3c71a48d90a2b022bd886bf581add2d68326.tar.gz frameworks_base-047f3c71a48d90a2b022bd886bf581add2d68326.tar.bz2 | |
resolved conflicts for merge of 3ee9dc58 to master
Change-Id: Idd045d01246367b77718210c8b6665110da58ac4
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/os/Build.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 7f1a2e4..63e15a9 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -476,6 +476,11 @@ public class Build { public static final int KITKAT = 19; /** + * Android 4.5: KitKat for watches, snacks on the run. + */ + public static final int KITKAT_WATCH = CUR_DEVELOPMENT; // STOPSHIP: update API level + + /** * L! * * <p>Applications targeting this or a later release will get these |