| commit | d82f26fde87e3d8ad5246d536100886fc34f4db3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:22:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:22:59 2015 +0000 |
| tree | 7bad41ff5f5f2fca5d25dc4c953d6ed26bd9f3ff | |
| parent | e8332fcd7062b531ade6c91d0cb349b11ef28832 [diff] | |
| parent | c84ce2000f443ef6c7a6df6ad0b1c76abae7790b [diff] |
am c84ce200: (-s ours) am dcb985ea: (-s ours) Import translations. DO NOT MERGE * commit 'c84ce2000f443ef6c7a6df6ad0b1c76abae7790b': Import translations. DO NOT MERGE