summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-11-05 13:57:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-05 13:57:41 -0700
commit4da6efc8a3ecfcf46a8988ad1d277ae00ed1f58c (patch)
tree70ac77a2300fe3d201896d3f2ec81a54ff607233 /tools
parent04856d99f8f353711f294254c1159461213684a5 (diff)
parent46151652b8dc562f4a3332e1d12fa799e3638ea8 (diff)
downloadframeworks_base-4da6efc8a3ecfcf46a8988ad1d277ae00ed1f58c.zip
frameworks_base-4da6efc8a3ecfcf46a8988ad1d277ae00ed1f58c.tar.gz
frameworks_base-4da6efc8a3ecfcf46a8988ad1d277ae00ed1f58c.tar.bz2
am 46151652: Merge "fix xlarge support in aapt for gingerbread" into gingerbread
* commit '46151652b8dc562f4a3332e1d12fa799e3638ea8': fix xlarge support in aapt for gingerbread
Diffstat (limited to 'tools')
-rw-r--r--tools/aapt/Command.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index ad0465d..661ecb1 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -1139,8 +1139,8 @@ int doDump(Bundle* bundle)
largeScreen = targetSdk >= 4 ? -1 : 0;
}
if (xlargeScreen > 0) {
- // Introduced in Honeycomb.
- xlargeScreen = targetSdk >= 10 ? -1 : 0;
+ // Introduced in Gingerbread.
+ xlargeScreen = targetSdk >= 9 ? -1 : 0;
}
if (anyDensity > 0) {
anyDensity = targetSdk >= 4 ? -1 : 0;