From: android-merger <android-merger@google.com>
Date: Wed, 15 Dec 2010 17:25:02 +0000 (-0800)
Subject: Merge branch 'master' into honeycomb-release
X-Git-Url: https://git.saurik.com/android/aapt.git/commitdiff_plain/cdb703a7b3feb738406d0a9c77fe091bfb2738cc?hp=2cb0f6e073c305097694e7332906d80146b3a9ee

Merge branch 'master' into honeycomb-release
---

diff --git a/Command.cpp b/Command.cpp
index 16fa95a..8ac7590 100644
--- a/Command.cpp
+++ b/Command.cpp
@@ -907,10 +907,10 @@ int doDump(Bundle* bundle)
                                     error.string());
                                 goto bail;
                         }
-                    } else if (tag == "uses-gl-texture") {
+                    } else if (tag == "supports-gl-texture") {
                         String8 name = getAttribute(tree, NAME_ATTR, &error);
                         if (name != "" && error == "") {
-                            printf("uses-gl-texture:'%s'\n", name.string());
+                            printf("supports-gl-texture:'%s'\n", name.string());
                         } else {
                             fprintf(stderr, "ERROR getting 'android:name' attribute: %s\n",
                                     error.string());