summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Dianne Hackborn <hackbod@google.com> 2011-09-11 11:21:09 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2011-09-11 11:21:09 -0700
commit8a48a2b96adb718f351ca3b6c3f25c74fef52a03 (patch)
treed5cc7360cd2087a477ca453b562d7ba3c68fdf22
parent3eff066c75d50ebc8b9f40d79853d5c926220463 (diff)
parentb7fd61ee81f52a3fb7489867ce7ef30905d911a2 (diff)
Merge "Fix build."
-rw-r--r--api/current.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/current.txt b/api/current.txt
index 47648a7bcb16..804a52485356 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -783,7 +783,7 @@ package android {
field public static final int reqNavigation = 16843306; // 0x101022a
field public static final int reqTouchScreen = 16843303; // 0x1010227
field public static final int required = 16843406; // 0x101028e
- field public static final int requiresFadingEdge = 16843699; // 0x10103b3
+ field public static final int requiresFadingEdge = 16843685; // 0x10103a5
field public static final int requiresSmallestWidthDp = 16843620; // 0x1010364
field public static final int resizeMode = 16843619; // 0x1010363
field public static final int resizeable = 16843405; // 0x101028d