diff options
| author | Baligh Uddin <baligh@google.com> | 2014-12-02 22:27:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 22:27:11 +0000 |
| commit | 3b027a374e6e8ba084b6dcfcdbf81ee581e20517 (patch) | |
| tree | 2eb8a369daef9530430dfc8dbb55376eac0d8237 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e105a70ae1dcfdbca15e188f27d7d3a1bea788d2 (diff) | |
| parent | 3bcc97e7a1eab012d55fa85fa352a95f7c26f547 (diff) | |
am 3bcc97e7: (-s ours) am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '3bcc97e7a1eab012d55fa85fa352a95f7c26f547':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions