summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorAlan Viverette <alanv@google.com>2014-03-05 02:09:32 +0000
committerAlan Viverette <alanv@google.com>2014-03-05 02:09:32 +0000
commit4b131046aa5685112b8f198a989daef13279cadb (patch)
treeb861b0d5e1089c0b3d7abb4c57dd934f74064dcd /api
parent9e0c0a6e974c8f006596207cb5ec92c7bfe1fa44 (diff)
downloadframeworks_base-4b131046aa5685112b8f198a989daef13279cadb.zip
frameworks_base-4b131046aa5685112b8f198a989daef13279cadb.tar.gz
frameworks_base-4b131046aa5685112b8f198a989daef13279cadb.tar.bz2
Revert "Revert "Fix the build.""
WE MUST GO DEEPER This reverts commit 9e0c0a6e974c8f006596207cb5ec92c7bfe1fa44. Change-Id: Ia89f764648e15a60ce488d8a2b4bce97bdb37b20
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 b9a2553..e24dd3b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -29899,7 +29899,7 @@ package android.view {
field public static final int FEATURE_ACTION_BAR = 8; // 0x8
field public static final int FEATURE_ACTION_BAR_OVERLAY = 9; // 0x9
field public static final int FEATURE_ACTION_MODE_OVERLAY = 10; // 0xa
- field public static final int FEATURE_CONTENT_TRANSITIONS = 11; // 0xb
+ field public static final int FEATURE_CONTENT_TRANSITIONS = 12; // 0xc
field public static final int FEATURE_CONTEXT_MENU = 6; // 0x6
field public static final int FEATURE_CUSTOM_TITLE = 7; // 0x7
field public static final int FEATURE_INDETERMINATE_PROGRESS = 5; // 0x5