Merge "Add K api version."
diff --git a/api/current.txt b/api/current.txt
index 632d779..72e7601 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -15743,6 +15743,7 @@
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 {
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index a7f39d5..52c89e8 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -431,6 +431,11 @@
* </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". */