summaryrefslogtreecommitdiffstats
path: root/tools/aapt
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-01-07 09:21:52 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-07 09:21:52 -0800
commit93cee56d87ef9571e7f535d0bf356b160d5f6710 (patch)
treebe957ca3c2ea556183cebcc262e3dd15e8882b0b /tools/aapt
parent1060147d5c3599f5035234dd2df28467495bfcc1 (diff)
parentce56857ef72538c197afd91b9f30dc868d2667d9 (diff)
downloadframeworks_base-93cee56d87ef9571e7f535d0bf356b160d5f6710.zip
frameworks_base-93cee56d87ef9571e7f535d0bf356b160d5f6710.tar.gz
frameworks_base-93cee56d87ef9571e7f535d0bf356b160d5f6710.tar.bz2
am ce56857e: am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"
Merge commit 'ce56857ef72538c197afd91b9f30dc868d2667d9' * commit 'ce56857ef72538c197afd91b9f30dc868d2667d9': Fix issue #2357259: aapt tool prints "uses-configuation:"
Diffstat (limited to 'tools/aapt')
-rw-r--r--tools/aapt/Command.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 51af965..5d345e6 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -679,7 +679,7 @@ int doDump(Bundle* bundle)
REQ_NAVIGATION_ATTR, NULL, 0);
int32_t reqFiveWayNav = getIntegerAttribute(tree,
REQ_FIVE_WAY_NAV_ATTR, NULL, 0);
- printf("uses-configuation:");
+ printf("uses-configuration:");
if (reqTouchScreen != 0) {
printf(" reqTouchScreen='%d'", reqTouchScreen);
}