diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-11 11:22:25 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-05-11 11:22:25 -0700 |
| commit | 7a9bde9ab13d9370c68c8e666baebab33be6e8cc (patch) | |
| tree | 9f787e2f66d65631177c58cb91b624132484d5c2 /tools | |
| parent | d01547761a8ec4bd1bcc4799a537b6fdcd9d24bc (diff) | |
| parent | 6ee44d1ff30627388bf3afa5fa542780af8f4005 (diff) | |
| download | frameworks_base-7a9bde9ab13d9370c68c8e666baebab33be6e8cc.zip frameworks_base-7a9bde9ab13d9370c68c8e666baebab33be6e8cc.tar.gz frameworks_base-7a9bde9ab13d9370c68c8e666baebab33be6e8cc.tar.bz2 | |
am 6ee44d1: Merge change 1258 into donut
Merge commit '6ee44d1ff30627388bf3afa5fa542780af8f4005'
* commit '6ee44d1ff30627388bf3afa5fa542780af8f4005':
Fix 1840639 to support overlays with zz_ZZ.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/aapt/ResourceTable.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/aapt/ResourceTable.cpp b/tools/aapt/ResourceTable.cpp index a09b1a6..ef11a83 100644 --- a/tools/aapt/ResourceTable.cpp +++ b/tools/aapt/ResourceTable.cpp @@ -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; } |