resolved conflicts for merge of 10d5b096 to master

Change-Id: Id5c6ba651f72b48f0d70ee2ca64a6c9adf5e74f7

diff --combined ResourceTable.cpp
index 90a62564a690138c5d2628a2532441ad14da8075,29644a69b4c7bee075b5616658312ff696a7dea0..1d6b18dcdd9531b1947ccb5cefc44c280c446abc
--- 1/ResourceTable.cpp
--- 2/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@@ -782,7 -782,6 +782,6 @@@ status_t compileResourceFile(Bundle* bu
      const String16 translatable16("translatable");
      const String16 formatted16("formatted");
      const String16 false16("false");
-     const String16 product16("product");
  
      const String16 myPackage(assets->getPackage());
  
@@@ -830,7 -829,6 +829,6 @@@
              bool curIsStyled = false;
              bool curIsPseudolocalizable = false;
              bool curIsFormatted = fileIsTranslatable;
-             String16 curProduct;
              bool localHasErrors = false;
  
              if (strcmp16(block.getElementName(&len), skip16.string()) == 0) {
@@@ -1228,8 -1226,6 +1226,6 @@@
                          translatable.setTo(block.getAttributeStringValue(i, &length));
                      } else if (strcmp16(attr, formatted16.string()) == 0) {
                          formatted.setTo(block.getAttributeStringValue(i, &length));
-                     } else if (strcmp16(attr, product16.string()) == 0) {
-                         curProduct.setTo(block.getAttributeStringValue(i, &length));
                      }
                  }
                  
@@@ -1356,6 -1352,12 +1352,12 @@@
                  hasErrors = localHasErrors = true;
              }
  
+             String16 product;
+             identIdx = block.indexOfAttribute(NULL, "product");
+             if (identIdx >= 0) {
+                 product = String16(block.getAttributeStringValue(identIdx, &len));
+             }
+ 
              String16 comment(block.getComment(&len) ? block.getComment(&len) : nulStr);
              
              if (curIsBag) {
@@@ -1447,7 -1449,7 +1449,7 @@@
  
                          err = parseAndAddBag(bundle, in, &block, curParams, myPackage, curType,
                                  ident, parentIdent, itemIdent, curFormat, curIsFormatted,
-                                 curProduct, false, overwrite, outTable);
+                                 product, false, overwrite, outTable);
                          if (err == NO_ERROR) {
                              if (curIsPseudolocalizable && localeIsDefined(curParams)
                                      && bundle->getPseudolocalize()) {
@@@ -1456,7 -1458,7 +1458,7 @@@
                                  block.setPosition(parserPosition);
                                  err = parseAndAddBag(bundle, in, &block, pseudoParams, myPackage,
                                          curType, ident, parentIdent, itemIdent, curFormat,
-                                         curIsFormatted, curProduct, true, overwrite, outTable);
+                                         curIsFormatted, product, true, overwrite, outTable);
  #endif
                              }
                          } 
@@@ -1480,7 -1482,7 +1482,7 @@@
  
                  err = parseAndAddEntry(bundle, in, &block, curParams, myPackage, curType, ident,
                          *curTag, curIsStyled, curFormat, curIsFormatted,
-                         curProduct, false, overwrite, outTable);
+                         product, false, overwrite, outTable);
  
                  if (err < NO_ERROR) { // Why err < NO_ERROR instead of err != NO_ERROR?
                      hasErrors = localHasErrors = true;
@@@ -1492,7 -1494,7 +1494,7 @@@
                          block.setPosition(parserPosition);
                          err = parseAndAddEntry(bundle, in, &block, pseudoParams, myPackage, curType,
                                  ident, *curTag, curIsStyled, curFormat,
-                                 curIsFormatted, curProduct,
+                                 curIsFormatted, product,
                                  true, overwrite, outTable);
                          if (err != NO_ERROR) {
                              hasErrors = localHasErrors = true;
@@@ -2440,7 -2442,7 +2442,7 @@@ ResourceTable::validateLocalizations(vo
          if (configSet.count(defaultLocale) == 0) {
              fprintf(stdout, "aapt: warning: string '%s' has no default translation in %s; found:",
                      String8(nameIter->first).string(), mBundle->getResourceSourceDirs()[0]);
 -            for (set<String8>::iterator locales = configSet.begin();
 +            for (set<String8>::const_iterator locales = configSet.begin();
                   locales != configSet.end();
                   locales++) {
                  fprintf(stdout, " %s", (*locales).string());