summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2010-01-06 13:46:50 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2010-01-06 13:46:50 -0800
commitce56857ef72538c197afd91b9f30dc868d2667d9 (patch)
tree9179268349c15e79193fa7a673643eaf1dd4fc9a /tools
parent80410b55f1eccf345fb6a01ca9a277935ac4098f (diff)
parentcb2d50d0d6e2e37ae02b014999da23ecd32038b8 (diff)
downloadframeworks_base-ce56857ef72538c197afd91b9f30dc868d2667d9.zip
frameworks_base-ce56857ef72538c197afd91b9f30dc868d2667d9.tar.gz
frameworks_base-ce56857ef72538c197afd91b9f30dc868d2667d9.tar.bz2
am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"
Merge commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8' into eclair-plus-aosp * commit 'cb2d50d0d6e2e37ae02b014999da23ecd32038b8': Fix issue #2357259: aapt tool prints "uses-configuation:"
Diffstat (limited to 'tools')
-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 8d524d9..3a30c0a 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -678,7 +678,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);
}