diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-01 17:06:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 17:06:24 +0000 |
| commit | 71ed8648e2c2b5b2ee4d74fcaf6be2b3f4e63388 (patch) | |
| tree | 43b0a7b9a08e7b3b4d7e3bc7e09b78256181a9e5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9a3d898a5802b4d3eb398fe618a4c2f202f96753 (diff) | |
| parent | 8455d01832f6d89b7ec296bdd8aada2672ecf608 (diff) | |
am 8455d018: (-s ours) am 5114a0ec: (-s ours) am 8fbed3d1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '8455d01832f6d89b7ec296bdd8aada2672ecf608':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions