diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-08-13 00:54:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 00:54:35 +0000 |
| commit | 9512a857454d761b53f46958733ba23216c41e64 (patch) | |
| tree | c74676b6193341fa5f3c96ffdf2e7776680d7608 /api | |
| parent | ea68c4ceacbe235c4d8688437010d855ef02e1fb (diff) | |
| parent | ff9912d594bc5cdc10a4a224b9a2296bac50851b (diff) | |
| download | frameworks_base-9512a857454d761b53f46958733ba23216c41e64.zip frameworks_base-9512a857454d761b53f46958733ba23216c41e64.tar.gz frameworks_base-9512a857454d761b53f46958733ba23216c41e64.tar.bz2 | |
am ff9912d5: Merge "Fix issue #23116383: Include security patch level in Settings" into mnc-dev
* commit 'ff9912d594bc5cdc10a4a224b9a2296bac50851b':
Fix issue #23116383: Include security patch level in Settings
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index cb63aaa..d7fdb2d 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22674,12 +22674,14 @@ package android.os { public static class Build.VERSION { 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 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; + field public static final java.lang.String SECURITY_PATCH; } public static class Build.VERSION_CODES { diff --git a/api/system-current.txt b/api/system-current.txt index a9bc944..3c88e59 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -24618,12 +24618,14 @@ package android.os { public static class Build.VERSION { 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 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; + field public static final java.lang.String SECURITY_PATCH; } public static class Build.VERSION_CODES { |