summaryrefslogtreecommitdiff
path: root/tools/aapt/Command.cpp
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-02-17 11:06:38 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-17 11:06:38 +0000
commit8c1fc83445f8dce7e6d0789feeed8bf98d33bf01 (patch)
treeb9eae6651529003e33abaea6a3f18fd17266fb42 /tools/aapt/Command.cpp
parent982931c72b6cd00c5eea28efc4b086f47f7aca17 (diff)
parent28879bbfe89dc4bf2067a7183975ecffb82f68e6 (diff)
am 28879bbf: am be57fca4: Merge "Extended locales in AAPT / AssetManager."
* commit '28879bbfe89dc4bf2067a7183975ecffb82f68e6': Extended locales in AAPT / AssetManager.
Diffstat (limited to 'tools/aapt/Command.cpp')
-rw-r--r--tools/aapt/Command.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/aapt/Command.cpp b/tools/aapt/Command.cpp
index 5d4232d97537..3c27a1952777 100644
--- a/tools/aapt/Command.cpp
+++ b/tools/aapt/Command.cpp
@@ -517,6 +517,7 @@ int doDump(Bundle* bundle)
// the API version because key resources like icons will have an implicit
// version if they are using newer config types like density.
ResTable_config config;
+ memset(&config, 0, sizeof(ResTable_config));
config.language[0] = 'e';
config.language[1] = 'n';
config.country[0] = 'U';