commit fc986d71caced8a758b74b699e6d8593dfd0bdc4
author Justin Koh <justinkoh@google.com> Tue May 13 16:52:17 2014 -0700
committer Justin Koh <justinkoh@google.com> Tue May 13 16:52:17 2014 -0700
tree 3b78d6601c1e2de61d48bf4360bc34469681081b
parent 11d04154811f8f64f86ff0652efe84868284ef8e
parent 32c5f2998f709819ce82fcea5d9f9072c5dc5626

resolved conflicts for merge of 32c5f299 to master

Change-Id: I72656792e109fea82c63a3a42151c024630f5997

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 36aa4a0..5bf6ec1 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -19644,7 +19644,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 KITKAT_WATCH = 20; // 0x14
     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 1ca6b90..b11f7e4 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -515,9 +515,16 @@
         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!