Merge "Adding version code R for development"
diff --git a/api/current.txt b/api/current.txt
index bf3b525..d344c2b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -34211,6 +34211,7 @@
field public static final int O_MR1 = 27; // 0x1b
field public static final int P = 28; // 0x1c
field public static final int Q = 29; // 0x1d
+ field public static final int R = 10000; // 0x2710
}
public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 4138e53..1eda4d9 100755
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -992,6 +992,11 @@
* engaged. It's now time to see if you can dance.</em>
*/
public static final int Q = 29;
+
+ /**
+ * R.
+ */
+ public static final int R = CUR_DEVELOPMENT;
}
/** The type of build, like "user" or "eng". */