am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"

* commit '63e43ba56a95708c229eec539a544967f1bbb7d7':
  Fix for issue 9656 - custom xml attributes in Android Libraries

diff --cc XMLNode.cpp
index 95a68d174580712c02e18331a4d510439a96aff4,d9782b01f0e61b641bdfe702ffb1a7e43eb86bd3..9ee6c84718d20e9a47af8578bd63033a7a0c171a
--- 1/XMLNode.cpp
--- 2/XMLNode.cpp
+++ b/XMLNode.cpp
@@@ -44,10 -45,10 +45,11 @@@ bool isWhitespace(const char16_t* str
  }
  
  static const String16 RESOURCES_PREFIX(RESOURCES_ROOT_NAMESPACE);
+ static const String16 RESOURCES_PREFIX_AUTO_PACKAGE(RESOURCES_AUTO_PACKAGE_NAMESPACE);
  static const String16 RESOURCES_PRV_PREFIX(RESOURCES_ROOT_PRV_NAMESPACE);
 +static const String16 RESOURCES_TOOLS_NAMESPACE("http://schemas.android.com/tools");
  
- String16 getNamespaceResourcePackage(String16 namespaceUri, bool* outIsPublic)
+ String16 getNamespaceResourcePackage(String16 appPackage, String16 namespaceUri, bool* outIsPublic)
  {
      //printf("%s starts with %s?\n", String8(namespaceUri).string(),
      //       String8(RESOURCES_PREFIX).string());