commit fed762b944efb690b10ca2705f02343dda0aab03
author Eric Fischer <enf@google.com> Mon Aug 16 07:49:51 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 16 07:49:51 2010 -0700
tree 578bfdb5e46a45cf98fbd574fe49bce631d54d6a
parent c93ba8ed0d0d6d442c72e9e895f2e19e01d29288
parent d22a1e896cbc7e86d57be9923d749b017b3cde79

am d22a1e89: am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false", not "true"." into gingerbread

Merge commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79'

* commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79':
  Change aapt's warning message to suggest formatted="false", not "true".

tools/aapt/XMLNode.cpp

diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp
index 452549b..cee8546 100644
--- a/tools/aapt/XMLNode.cpp
+++ b/tools/aapt/XMLNode.cpp
@@ -166,7 +166,7 @@
     if (argCount > 1 && nonpositional) {
         SourcePos(String8(fileName), inXml->getLineNumber()).error(
                 "Multiple substitutions specified in non-positional format; "
-                "did you mean to add the formatted=\"true\" attribute?\n");
+                "did you mean to add the formatted=\"false\" attribute?\n");
         return NOT_ENOUGH_DATA;
     }