diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-01 16:54:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 16:54:13 +0000 |
| commit | 8455d01832f6d89b7ec296bdd8aada2672ecf608 (patch) | |
| tree | 98e7456eec6fc6df6b7478bde91a23599e013a37 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4bdf81a07f3279c0477a4d0c565857ab10674974 (diff) | |
| parent | 5114a0ec7400486ce8c4aca734d9151c73f7e486 (diff) | |
am 5114a0ec: (-s ours) am 8fbed3d1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '5114a0ec7400486ce8c4aca734d9151c73f7e486':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions