summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2010-08-13 14:56:47 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-13 14:56:47 -0700
commitd22a1e896cbc7e86d57be9923d749b017b3cde79 (patch)
tree4fc2c45faa7e8e85d6916abf74fd1edb687183e4 /tools
parent164eb050bdbaacb83e48a00c56b78d3c587a6e34 (diff)
parent244152bfb9020341953d3e541c85eb3961806378 (diff)
downloadframeworks_base-d22a1e896cbc7e86d57be9923d749b017b3cde79.zip
frameworks_base-d22a1e896cbc7e86d57be9923d749b017b3cde79.tar.gz
frameworks_base-d22a1e896cbc7e86d57be9923d749b017b3cde79.tar.bz2
am 244152bf: Merge "Change aapt\'s warning message to suggest formatted="false", not "true"." into gingerbread
Merge commit '244152bfb9020341953d3e541c85eb3961806378' into gingerbread-plus-aosp * commit '244152bfb9020341953d3e541c85eb3961806378': Change aapt's warning message to suggest formatted="false", not "true".
Diffstat (limited to 'tools')
-rw-r--r--tools/aapt/XMLNode.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/XMLNode.cpp b/tools/aapt/XMLNode.cpp
index 57ff47a..8551b0f 100644
--- a/tools/aapt/XMLNode.cpp
+++ b/tools/aapt/XMLNode.cpp
@@ -166,7 +166,7 @@ status_t hasSubstitutionErrors(const char* fileName,
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;
}