diff options
| author | Tim Kilbourn <tkilbourn@google.com> | 2014-05-06 18:00:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-06 18:00:35 +0000 |
| commit | a4853f6d7384fe98301f9c8ec3042b647a1abd87 (patch) | |
| tree | 2d9dc4bdada617b539f4d81e67db3df920f64933 /api | |
| parent | d5090dacfca5b5fff8cd1a6fda52b30d31c3c301 (diff) | |
| parent | a2d106d4703c1473772756a2201d2b11492489c5 (diff) | |
| download | frameworks_base-a4853f6d7384fe98301f9c8ec3042b647a1abd87.zip frameworks_base-a4853f6d7384fe98301f9c8ec3042b647a1abd87.tar.gz frameworks_base-a4853f6d7384fe98301f9c8ec3042b647a1abd87.tar.bz2 | |
am 3439728c: Fix bad merge.
* commit '3439728cebd6fad754ffcf33ea6d640e6ddc6f87':
Fix bad merge.
Diffstat (limited to 'api')
| -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 d90d61a..93dfc19 100644 --- a/api/current.txt +++ b/api/current.txt @@ -657,6 +657,7 @@ package android { field public static final int isAsciiCapable = 16843753; // 0x10103e9 field public static final int isAuxiliary = 16843647; // 0x101037f field public static final int isDefault = 16843297; // 0x1010221 + field public static final int isGame = 16843764; // 0x10103f4 field public static final int isIndicator = 16843079; // 0x1010147 field public static final int isModifier = 16843334; // 0x1010246 field public static final int isRepeatable = 16843336; // 0x1010248 |