commit 3ee9dc58e5e1e39fac184b98cac0c7c46af72dd9
author Jeff Brown <jeffbrown@google.com> Wed Apr 16 20:52:24 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 16 20:52:24 2014 +0000
tree e278ddb4d7ae20a621a21376b3f8a12eb78cb44a
parent 4b81e89d9b7a2cf3ed5aacd9c647aed47f4c4675
parent fa72a9eaae6170e65d9ba72720ee7b0d752f8847

am fa72a9ea: Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev

* commit 'fa72a9eaae6170e65d9ba72720ee7b0d752f8847':
  Declare VersionCodes.KITKAT_WATCH.

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index ea3b2b2..3d8fd96 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -17667,6 +17667,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
   }
 
   public final class Bundle implements java.lang.Cloneable android.os.Parcelable {

core/java/android/os/Build.java

diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index b2e0b29..fae2d52 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -474,6 +474,11 @@
          * </ul>
          */
         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
     }
     
     /** The type of build, like "user" or "eng". */