commit 8ee1d97c0909fc2679b457ea9eb6e2d1c1131211
author Kenny Root <kroot@google.com> Thu Mar 18 19:15:51 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 18 19:15:51 2010 -0700
tree 570daf61eb920493782420bffaa9f327e728b5c5
parent 078fd47e91d495175927d1a4a8b9aad039a7ba4e
parent ed9830999aede5e827b31446f91ad90a37b8bba9

Merge "Make aapt warning concise"

tools/aapt/Resource.cpp

diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index 87f2420..a8ac2ec 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -611,7 +611,8 @@
     const String16 attr(attr8);
     
     if (node->getAttribute(ns, attr) != NULL) {
-        fprintf(stderr, "Warning: AndroidManifest.xml already defines %s (in %s)\n",
+        fprintf(stderr, "Warning: AndroidManifest.xml already defines %s (in %s);"
+                        " using existing value in manifest.\n",
                 String8(attr).string(), String8(ns).string());
         return;
     }