diff options
| author | Dianne Hackborn <hackbod@google.com> | 2013-10-04 09:11:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-04 09:11:32 -0700 |
| commit | a37bbc6afc9700c4b7ff7f8e116f656c608c9ae0 (patch) | |
| tree | 591268419aed1c41d0f3ba9b1a14bf7a0e9d7275 /api | |
| parent | 4aa55c006f07d04ce8ddfeff936a4cc6e4a01b5e (diff) | |
| parent | 8a5f7ab6e18e05a54a3ae7e0acb7e1b728ad613c (diff) | |
| download | frameworks_base-a37bbc6afc9700c4b7ff7f8e116f656c608c9ae0.zip frameworks_base-a37bbc6afc9700c4b7ff7f8e116f656c608c9ae0.tar.gz frameworks_base-a37bbc6afc9700c4b7ff7f8e116f656c608c9ae0.tar.bz2 | |
am 8a5f7ab6: am 22c298a5: am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev
* commit '8a5f7ab6e18e05a54a3ae7e0acb7e1b728ad613c':
KLP/KitKat is now API 19.
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt index 1ce6fff..8cfccd2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17898,7 +17898,7 @@ package android.os { field public static final int JELLY_BEAN = 16; // 0x10 field public static final int JELLY_BEAN_MR1 = 17; // 0x11 field public static final int JELLY_BEAN_MR2 = 18; // 0x12 - field public static final int KITKAT = 10000; // 0x2710 + field public static final int KITKAT = 19; // 0x13 } public final class Bundle implements java.lang.Cloneable android.os.Parcelable { |