diff options
| author | Baligh Uddin <baligh@google.com> | 2014-10-01 17:20:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 17:20:34 +0000 |
| commit | f7ade46cc5edb1f2f369ae22070b786729754932 (patch) | |
| tree | d066a99b326cac6be38e9717cb969561b9fcc76a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 394f29e7618952fb6eee7ca53f434b418bbd3ded (diff) | |
| parent | 7249a8bba9fed353c18c94fbe44cf24fba024620 (diff) | |
am 7249a8bb: (-s ours) am ff99ff98: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '7249a8bba9fed353c18c94fbe44cf24fba024620':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions