diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-04 13:54:35 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-04 13:54:35 +0000 |
| commit | 0d6246a660f05275333b97ce04222621489f6b85 (patch) | |
| tree | 59a0e719c2efadb66387c2bf2bfb8760b580435a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2a90c8f9c94375ee7c77340fe2e79726b066ffb8 (diff) | |
| parent | 97735297307eccc3cedb537fe88a2a76d473f798 (diff) | |
am 97735297: (-s ours) am 42796e97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '97735297307eccc3cedb537fe88a2a76d473f798':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions