| commit | 6aaa071f23c5e7d80da778420761836504292813 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 22 14:26:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 22 14:26:56 2015 +0000 |
| tree | 0b544384e40ec13939cbdf64d17e15cba1392af5 | |
| parent | 6063a67fa391fc819c21592c441051d9141fd475 [diff] | |
| parent | 4ea30fd58f6bfefba80ec479b1a07a65e1b4cf55 [diff] |
am 4ea30fd5: (-s ours) am 608ec572: (-s ours) am 8cad4b59: (-s ours) Import translations. DO NOT MERGE * commit '4ea30fd58f6bfefba80ec479b1a07a65e1b4cf55': Import translations. DO NOT MERGE