| commit | 475b4432e1087634e193a3de5051e6d5a48f932d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:43:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:43:45 2015 +0000 |
| tree | 2da686b8ece2644cd8a7b0aa9de6364a8c8889d8 | |
| parent | d3bda4dd6c42a7b2945237832a1e256b9cae437a [diff] | |
| parent | 9ebc9463ece53c75e290a4ca378f46f19d087614 [diff] |
am 9ebc9463: (-s ours) am 9942e6f2: (-s ours) am 3c46e939: (-s ours) Import translations. DO NOT MERGE * commit '9ebc9463ece53c75e290a4ca378f46f19d087614': Import translations. DO NOT MERGE