diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-08 14:34:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-08 14:34:39 +0000 |
| commit | 8eafcc164756869f6a8529cb6b5683483eb6639b (patch) | |
| tree | 1bb2deb78d04073639407a0793b12e1ada57f25b /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | cc92ae9871acdb4d15e2badbfe37e8cdebffe639 (diff) | |
| parent | bf965352df56939979a175371adc032fb9e7f3f2 (diff) | |
am bf965352: (-s ours) am e53e421e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'bf965352df56939979a175371adc032fb9e7f3f2':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions