summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2015-05-08 17:59:29 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-08 17:59:31 +0000
commit5b56159b8e2e1c494b4d8fb9d2b0aeef59aaddd4 (patch)
tree91d6a14749f95c32b61c2b5893fec360036d4908 /api
parente1a1d2e85a3f0626ae13322998fd45a1eb4a49d7 (diff)
parente960030f75d2b510706c4623d94ad71aba427fb8 (diff)
downloadframeworks_base-5b56159b8e2e1c494b4d8fb9d2b0aeef59aaddd4.zip
frameworks_base-5b56159b8e2e1c494b4d8fb9d2b0aeef59aaddd4.tar.gz
frameworks_base-5b56159b8e2e1c494b4d8fb9d2b0aeef59aaddd4.tar.bz2
Merge "Add Build.VERSION.PREVIEW_SDK_INT" into mnc-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt1
-rw-r--r--api/system-current.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 929da0e..ac623ac 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22667,6 +22667,7 @@ package android.os {
ctor public Build.VERSION();
field public static final java.lang.String CODENAME;
field public static final java.lang.String INCREMENTAL;
+ field public static final int PREVIEW_SDK_INT;
field public static final java.lang.String RELEASE;
field public static final deprecated java.lang.String SDK;
field public static final int SDK_INT;
diff --git a/api/system-current.txt b/api/system-current.txt
index f9fa4e3..8ff6f6b 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -24566,6 +24566,7 @@ package android.os {
ctor public Build.VERSION();
field public static final java.lang.String CODENAME;
field public static final java.lang.String INCREMENTAL;
+ field public static final int PREVIEW_SDK_INT;
field public static final java.lang.String RELEASE;
field public static final deprecated java.lang.String SDK;
field public static final int SDK_INT;