diff options
| author | Geoff Mendal <mendal@google.com> | 2014-10-13 18:57:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-13 18:57:47 +0000 |
| commit | 06f6b38b76490d574232b526423777d271031730 (patch) | |
| tree | f7e4affe4b23e49dba29712777c563a15ca20058 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ce9003f7c24f44d8e1d1fee65dca444e6a61d061 (diff) | |
| parent | ad12f288b1199b636c3961bb86fd11ed2749065e (diff) | |
am ad12f288: (-s ours) am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'ad12f288b1199b636c3961bb86fd11ed2749065e':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions