summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-09-18 20:15:26 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-18 20:15:26 +0000
commitbd49a1dadfbd7803642066a5bdc74305a1b2340b (patch)
tree0f6bc91c4d8896a85a1657cf2b023d7940c8d21a /api
parentc7969dea24f2e362f69fb2b912c8a0385f5dc617 (diff)
parentadd560288a40008e643765dc28a07cd1499c8430 (diff)
downloadframeworks_base-bd49a1dadfbd7803642066a5bdc74305a1b2340b.zip
frameworks_base-bd49a1dadfbd7803642066a5bdc74305a1b2340b.tar.gz
frameworks_base-bd49a1dadfbd7803642066a5bdc74305a1b2340b.tar.bz2
Merge "Change case of "keyset" to "keySet" for manifests" into klp-dev
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 739ef4c..11502e8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -639,13 +639,13 @@ package android {
field public static final int keyPreviewHeight = 16843321; // 0x1010239
field public static final int keyPreviewLayout = 16843319; // 0x1010237
field public static final int keyPreviewOffset = 16843320; // 0x1010238
+ field public static final int keySet = 16843739; // 0x10103db
field public static final int keyTextColor = 16843318; // 0x1010236
field public static final int keyTextSize = 16843316; // 0x1010234
field public static final int keyWidth = 16843325; // 0x101023d
field public static final int keyboardLayout = 16843691; // 0x10103ab
field public static final int keyboardMode = 16843341; // 0x101024d
field public static final int keycode = 16842949; // 0x10100c5
- field public static final int keyset = 16843739; // 0x10103db
field public static final int killAfterRestore = 16843420; // 0x101029c
field public static final int label = 16842753; // 0x1010001
field public static final int labelFor = 16843718; // 0x10103c6