summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-11-06 16:24:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-06 16:24:28 -0700
commit41a4833bf2603d4194e470f783531581dd532545 (patch)
tree1cc53ac16a0c261991dce82092d571cf80caf163 /tools
parent3513c3f17f6fdbb92d1bf3be68df97708bacbc82 (diff)
parent4da6efc8a3ecfcf46a8988ad1d277ae00ed1f58c (diff)
downloadframeworks_base-41a4833bf2603d4194e470f783531581dd532545.zip
frameworks_base-41a4833bf2603d4194e470f783531581dd532545.tar.gz
frameworks_base-41a4833bf2603d4194e470f783531581dd532545.tar.bz2
am 4da6efc8: am 46151652: Merge "fix xlarge support in aapt for gingerbread" into gingerbread
* commit '4da6efc8a3ecfcf46a8988ad1d277ae00ed1f58c': 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 e9833c9..16fa95a 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -1142,8 +1142,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;