| commit | 7521c1a03e929ab7d26d4492a434a4b33bfe52c3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 05 12:34:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 05 12:34:59 2015 +0000 |
| tree | 3a732a352c2377d48347e23411b844599b05519b | |
| parent | ae8aea76e5cbef1eefde401f8622d05275156cf7 [diff] | |
| parent | 82c61b2dd878eae9a30bd7953bf3e2390e1e5611 [diff] |
am 82c61b2d: (-s ours) am 010d2fcd: (-s ours) Import translations. DO NOT MERGE * commit '82c61b2dd878eae9a30bd7953bf3e2390e1e5611': Import translations. DO NOT MERGE