diff options
| author | Geoff Mendal <mendal@google.com> | 2014-12-17 15:04:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-17 15:04:20 +0000 |
| commit | d128a280d7a2ee8a9550473a625a14897871375f (patch) | |
| tree | 1e2c39a06726edfa0ed207686da686e493297049 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5846f31a43b424bc8f167ab881c5d6867aa56e16 (diff) | |
| parent | 00e2afb7cf26b231143867e7292a29391c6cfe6e (diff) | |
am 00e2afb7: (-s ours) am 6641a0b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '00e2afb7cf26b231143867e7292a29391c6cfe6e':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions