diff options
| author | Geoff Mendal <mendal@google.com> | 2014-10-20 14:17:13 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-20 14:17:13 +0000 |
| commit | 1d5ac8dcee3b36a00d44858016f5192115f0b127 (patch) | |
| tree | dc2200ae34d1ea4696a6a7b8fdad3713daa550a9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 95469083da052dbcdb49ed505ff2238c101e2c66 (diff) | |
| parent | 97f548ec76aaf26b92fa553cccfd73f66ddc9b95 (diff) | |
am 97f548ec: (-s ours) am bae5d85a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '97f548ec76aaf26b92fa553cccfd73f66ddc9b95':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions