From: Dianne Hackborn <hackbod@google.com>
Date: Thu, 7 Jan 2010 17:21:52 +0000 (-0800)
Subject: am ce56857e: am cb2d50d0: Fix issue #2357259: aapt tool prints "uses-configuation:"
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/30275038bb13ac252ffe19c89f9f8a5526541f0f?hp=-c

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

30275038bb13ac252ffe19c89f9f8a5526541f0f
diff --combined Command.cpp
index 51af965,3a30c0a..5d345e6
--- a/Command.cpp
+++ b/Command.cpp
@@@ -412,7 -412,6 +412,7 @@@ int doDump(Bundle* bundle
              }
              tree.restart();
              printXMLBlock(&tree);
 +            tree.uninit();
              delete asset;
              asset = NULL;
          }
@@@ -679,7 -678,7 +679,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);
                          }