commit 047f3c71a48d90a2b022bd886bf581add2d68326
author Jeff Brown <jeffbrown@google.com> Wed Apr 16 14:18:49 2014 -0700
committer Jeff Brown <jeffbrown@google.com> Wed Apr 16 14:18:49 2014 -0700
tree 8e3c94eacf5fa0df69ad7ae996e81ec2d7e32835
parent 2adb422928d35b34cfd8c52170e0df7ffc681816
parent 3ee9dc58e5e1e39fac184b98cac0c7c46af72dd9

resolved conflicts for merge of 3ee9dc58 to master

Change-Id: Idd045d01246367b77718210c8b6665110da58ac4

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index b163bd3..9edc6d3 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -19102,6 +19102,7 @@
     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 L = 10000; // 0x2710
   }
 

core/java/android/os/Build.java

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