Merge "Add K api version."

2013-01-09 16:11:05 -08:00
parent 6b0fb36870 a985c3bb14
commit ee49a3a007
2 changed files with 6 additions and 0 deletions
--- a/api/current.txt
+++ b/api/current.txt
@@ -15743,6 +15743,7 @@ package android.os {
    field public static final int ICE_CREAM_SANDWICH_MR1 = 15; // 0xf
    field public static final int JELLY_BEAN = 16; // 0x10
    field public static final int JELLY_BEAN_MR1 = 17; // 0x11
+    field public static final int K = 10000; // 0x2710
  }

  public final class Bundle implements java.lang.Cloneable android.os.Parcelable {
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -431,6 +431,11 @@ public class Build {
         * </ul>
         */
        public static final int JELLY_BEAN_MR1 = 17;
+
+        /**
+         * Android X.X: "K".  Just "K"
+         */
+        public static final int K = CUR_DEVELOPMENT;
    }
    
    /** The type of build, like "user" or "eng". */