diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-25 17:12:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-25 17:12:34 +0000 |
| commit | c88604bcb94ce23706767bf10db24ff23a68a4b5 (patch) | |
| tree | 6182b2630b2254a6ad010ecb6a77aa8cc5fcf385 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | d170ff32c03cd6c8cf85e9f820342a26d3dbba78 (diff) | |
| parent | 6715b9dda1ada0a71ddc8215bc9c050c76fb309d (diff) | |
am 6715b9dd: (-s ours) am bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '6715b9dda1ada0a71ddc8215bc9c050c76fb309d':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions