diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-01 17:06:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 17:06:36 +0000 |
| commit | fd5a2c268933337a0028a8c6a3a76394f7dba441 (patch) | |
| tree | 43b0a7b9a08e7b3b4d7e3bc7e09b78256181a9e5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9fd7ac26e3d87a1444a2bb8610fd001bd191e2fd (diff) | |
| parent | 6afc39822e0b98000bed7846669106bb4a0805bc (diff) | |
am 6afc3982: (-s ours) am 9bc4bdea: (-s ours) am 1491492a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '6afc39822e0b98000bed7846669106bb4a0805bc':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions