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

diff --combined Command.cpp
index 8d524d9a73021bc8d60fce812dafc91145d43735,8be9db3ab853c2f2262d11a4773ac00bc14ec422..3a30c0af42187787ca40451b8cea6a6a4da1bd3f
--- 1/Command.cpp
--- 2/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);
                          }