am d22a1e89: am 244152bf: Merge "Change aapt\'s warning message to suggest formatted...

Merge commit 'd22a1e896cbc7e86d57be9923d749b017b3cde79'

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

diff --combined XMLNode.cpp
index 452549b80b8503eee2e7a270bd86edccb0af23bc,8551b0f9c9030c57d00d8dbba6085a0fc9952ac5..cee85469c8481ceabd2d3b98cb49b6852f4fe1aa
--- 1/XMLNode.cpp
--- 2/XMLNode.cpp
+++ b/XMLNode.cpp
@@@ -166,7 -166,7 +166,7 @@@ status_t hasSubstitutionErrors(const ch
      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;
      }
  
@@@ -203,13 -203,9 +203,13 @@@ status_t parseStyledString(Bundle* bund
                  }
              }
              if (xliffDepth == 0 && pseudolocalize) {
 +#ifdef ENABLE_PSEUDOLOCALIZE
                  std::string orig(String8(text).string());
                  std::string pseudo = pseudolocalize_string(orig);
                  curString.append(String16(String8(pseudo.c_str())));
 +#else
 +                assert(false);
 +#endif
              } else {
                  if (isFormatted && hasSubstitutionErrors(fileName, inXml, text) != NO_ERROR) {
                      return UNKNOWN_ERROR;