diff options
| author | Baligh Uddin <baligh@google.com> | 2014-12-03 00:30:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-03 00:30:26 +0000 |
| commit | 12cadd4daf3c3646127663d7d709f03a7e5aeeaf (patch) | |
| tree | 1b501424ea3228ec785ee53fa5c74db2b4f9623a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 68ccc097e97f8564b359cf76ae680f2ef14f6d3b (diff) | |
| parent | 3b027a374e6e8ba084b6dcfcdbf81ee581e20517 (diff) | |
am 3b027a37: (-s ours) am 3bcc97e7: (-s ours) am 6774911e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '3b027a374e6e8ba084b6dcfcdbf81ee581e20517':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions