diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 03:17:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 03:17:55 +0000 |
| commit | bb22aa897d8ecea9eb989ba720e390a3934e851a (patch) | |
| tree | b8542c15784ecb74ca84b20ef2813fddd1643a6e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 99854983bc8c57fb56cde595ccc0dba0ac30a6bf (diff) | |
| parent | 3eb0ccbde558f9fccbc3c880fa00a9579ffdaa04 (diff) | |
am 3eb0ccbd: (-s ours) am 684a63f1: (-s ours) am 18b2419d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '3eb0ccbde558f9fccbc3c880fa00a9579ffdaa04':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions