diff options
| author | Geoff Mendal <mendal@google.com> | 2015-07-20 14:46:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-20 14:46:00 +0000 |
| commit | 7fa4d2a748b94aaddba1a523e671eeea4031ce64 (patch) | |
| tree | 10e6b2c3de02f82757b1a07b2ab7070d92d0c9a7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | bf9b9b1e44ef0edfa0f325ee8141f9a09111cbc6 (diff) | |
| parent | f3d1f3af76521e5d1c036016551c271c3112b8aa (diff) | |
am f3d1f3af: (-s ours) am 5cc92074: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'f3d1f3af76521e5d1c036016551c271c3112b8aa':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions