diff options
| author | Geoff Mendal <mendal@google.com> | 2015-01-19 15:18:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-19 15:18:09 +0000 |
| commit | a2a6a7d2ee1caf495320b6c716ef3dfedbba17ff (patch) | |
| tree | 33019e38f1cd6a7ae3af33d86f0b3bc1ae37cb03 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e9a6f035295f34a45d35400cbaf80174ff7ddef8 (diff) | |
| parent | bb0bb9aebb76a516bae7b32054852eb828a8ece8 (diff) | |
am bb0bb9ae: (-s ours) am 8a28956d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'bb0bb9aebb76a516bae7b32054852eb828a8ece8':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions