OSDN Git Service

Merge "API that reports first SDK level of the device."
authorJeff Sharkey <jsharkey@google.com>
Wed, 13 Dec 2017 16:53:55 +0000 (16:53 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 13 Dec 2017 16:53:55 +0000 (16:53 +0000)
1  2 
api/current.txt
core/java/android/os/Build.java

diff --cc api/current.txt
@@@ -30968,8 -30950,8 +30968,9 @@@ package android.os 
      ctor public Build.VERSION();
      field public static final java.lang.String BASE_OS;
      field public static final java.lang.String CODENAME;
+     field public static final int FIRST_SDK_INT;
      field public static final java.lang.String INCREMENTAL;
 +    field public static final int MIN_SUPPORTED_TARGET_SDK_INT;
      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;
Simple merge