diff options
| author | Baligh Uddin <baligh@google.com> | 2014-10-19 20:07:19 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-19 20:07:19 +0000 |
| commit | 475737db01b1de3d164bd5f5c78e6304d98ac10b (patch) | |
| tree | d2b70585d8fd4d57f3977547fb615b47b05085e9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 02e4726063ea6d6cece7e6c235a35fa0005c04f1 (diff) | |
| parent | 425c06a0b08f7ef1de396cd4cf6bc490171cc2e7 (diff) | |
am 425c06a0: (-s ours) am 4199680a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '425c06a0b08f7ef1de396cd4cf6bc490171cc2e7':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions