diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-07-30 18:34:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-07-30 18:34:36 -0700 |
| commit | d913cf18595b8288125171eec86e42a1d1b4d93e (patch) | |
| tree | d2b2aa40d54903280ab06b51fd55808e99969219 /api/current.txt | |
| parent | f15c2321dd4e592722673430710915dac5150eea (diff) | |
| parent | 435cdb4604d9112c2fa8b2bb8d0ec49468bfdcf2 (diff) | |
| download | frameworks_base-d913cf18595b8288125171eec86e42a1d1b4d93e.zip frameworks_base-d913cf18595b8288125171eec86e42a1d1b4d93e.tar.gz frameworks_base-d913cf18595b8288125171eec86e42a1d1b4d93e.tar.bz2 | |
Merge "New API level 17 for JB MR1." into jb-mr1-dev
Diffstat (limited to 'api/current.txt')
| -rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index d37b2922..f987d5e 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15542,6 +15542,7 @@ package android.os { field public static final int ICE_CREAM_SANDWICH = 14; // 0xe 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 } public final class Bundle implements java.lang.Cloneable android.os.Parcelable { |