diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-09 13:16:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-09 13:16:40 +0000 |
| commit | 36ae48a850bade17d485cb49dd40a3f11f667ad4 (patch) | |
| tree | 4ae798660a3856c96d0db25e08f415af09d671ab /api/current.txt | |
| parent | d8497e45c72fbb27961d096499984906af19d35f (diff) | |
| parent | d83e9e42805e340384f30199777fbc472c5c6f20 (diff) | |
| download | frameworks_base-36ae48a850bade17d485cb49dd40a3f11f667ad4.zip frameworks_base-36ae48a850bade17d485cb49dd40a3f11f667ad4.tar.gz frameworks_base-36ae48a850bade17d485cb49dd40a3f11f667ad4.tar.bz2 | |
am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit 'd83e9e42805e340384f30199777fbc472c5c6f20':
Put in real "code" (aka marketing) name.
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 1e4d639..0e01452 100644 --- a/api/current.txt +++ b/api/current.txt @@ -21401,6 +21401,7 @@ package android.os { field public static final int KITKAT = 19; // 0x13 field public static final int KITKAT_WATCH = 20; // 0x14 field public static final int L = 21; // 0x15 + field public static final int LOLLIPOP = 21; // 0x15 } public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable { |