From: Dianne Hackborn <hackbod@google.com>
Date: Wed, 6 Jan 2010 21:46:50 +0000 (-0800)
Subject: am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/287883aced44b316c64f3581444caeaf139e7661?hp=-c

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:"
---

287883aced44b316c64f3581444caeaf139e7661
diff --combined Command.cpp
index 8d524d9,8be9db3..3a30c0a
--- a/Command.cpp
+++ b/Command.cpp
@@@ -401,7 -401,7 +401,7 @@@ int doDump(Bundle* bundle
              ResXMLTree tree;
              asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
              if (asset == NULL) {
 -                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
 +                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                  goto bail;
              }
  
@@@ -427,7 -427,7 +427,7 @@@
              ResXMLTree tree;
              asset = assets.openNonAsset(resname, Asset::ACCESS_BUFFER);
              if (asset == NULL) {
 -                fprintf(stderr, "ERROR: dump failed because resource %p found\n", resname);
 +                fprintf(stderr, "ERROR: dump failed because resource %s found\n", resname);
                  goto bail;
              }
  
@@@ -678,7 -678,7 +678,7 @@@
                                  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);
                          }