am 3442611e: am 5580e44c: Merge "Support changing style parent in overlays"

* commit '3442611ee11b2987c83054fe3c7ed5521f27f052':
  Support changing style parent in overlays

diff --combined ResourceTable.cpp
index 1d6b18dcdd9531b1947ccb5cefc44c280c446abc,fc576a67f10d383d5ef6ffa8ba3e469979f10288..a77042ab0b7628c0a947c2ccf209bf23a61594e2
--- 1/ResourceTable.cpp
--- 2/ResourceTable.cpp
+++ b/ResourceTable.cpp
@@@ -1724,13 -1724,6 +1724,6 @@@ status_t ResourceTable::startBag(const 
      
      // If a parent is explicitly specified, set it.
      if (bagParent.size() > 0) {
-         String16 curPar = e->getParent();
-         if (curPar.size() > 0 && curPar != bagParent) {
-             sourcePos.error("Conflicting parents specified, was '%s', now '%s'\n",
-                             String8(e->getParent()).string(),
-                             String8(bagParent).string());
-             return UNKNOWN_ERROR;
-         }
          e->setParent(bagParent);
      }
  
@@@ -1778,13 -1771,6 +1771,6 @@@ status_t ResourceTable::addBag(const So
  
      // If a parent is explicitly specified, set it.
      if (bagParent.size() > 0) {
-         String16 curPar = e->getParent();
-         if (curPar.size() > 0 && curPar != bagParent) {
-             sourcePos.error("Conflicting parents specified, was '%s', now '%s'\n",
-                     String8(e->getParent()).string(),
-                     String8(bagParent).string());
-             return UNKNOWN_ERROR;
-         }
          e->setParent(bagParent);
      }
  
@@@ -2442,7 -2428,7 +2428,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());