]> git.saurik.com Git - android/aapt.git/commitdiff
am ce56857e: am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"
authorDianne Hackborn <hackbod@google.com>
Thu, 7 Jan 2010 17:21:52 +0000 (09:21 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 7 Jan 2010 17:21:52 +0000 (09:21 -0800)
Merge commit 'ce56857ef72538c197afd91b9f30dc868d2667d9'

* commit 'ce56857ef72538c197afd91b9f30dc868d2667d9':
  Fix issue #2357259: aapt tool prints "uses-configuation:"

1  2 
Command.cpp

diff --combined Command.cpp
index 51af9650612e79557b61fdcfa518ea1f4e188b9d,3a30c0af42187787ca40451b8cea6a6a4da1bd3f..5d345e6d246ba79a18113c27e58384b877338572
@@@ -412,7 -412,6 +412,7 @@@ int doDump(Bundle* bundle
              }
              tree.restart();
              printXMLBlock(&tree);
 +            tree.uninit();
              delete asset;
              asset = NULL;
          }
                                  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);
                          }