diff options
author | Geoff Mendal <mendal@google.com> | 2015-11-16 17:50:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-11-16 17:50:57 +0000 |
commit | e490a14629561e3d61f679bbaaad6ba4723a1c15 (patch) | |
tree | eaa56164b1199bac8a54040ecbd62fb7491bf184 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 5482308a0a41a7bb25a8bdabd88676eee02254b1 (diff) | |
parent | f39bb92f5a90b9d3e2e958535c16eee5a7aacd97 (diff) |
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am: 812794f0f5 -s ours
am: f39bb92f5a -s ours
* commit 'f39bb92f5a90b9d3e2e958535c16eee5a7aacd97':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions