am 6ee44d1: Merge change 1258 into donut
Merge commit '6ee44d1ff30627388bf3afa5fa542780af8f4005' * commit '6ee44d1ff30627388bf3afa5fa542780af8f4005': Fix 1840639 to support overlays with zz_ZZ.
This commit is contained in:
committed by
The Android Open Source Project
commit
7a9bde9ab1
@@ -1225,7 +1225,7 @@ status_t compileResourceFile(Bundle* bundle,
|
||||
// pseudolocalize here
|
||||
block.setPosition(parserPosition);
|
||||
err = parseAndAddEntry(bundle, in, &block, pseudoParams, myPackage, curType,
|
||||
ident, *curTag, curIsStyled, curFormat, true, false, outTable);
|
||||
ident, *curTag, curIsStyled, curFormat, true, overwrite, outTable);
|
||||
if (err != NO_ERROR) {
|
||||
hasErrors = localHasErrors = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user