| commit | 9f1181e968eebcfe7f7f9cfd4e6b7b11eb4b47b4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Oct 14 14:22:31 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 14 14:22:31 2015 +0000 |
| tree | b3f0e72d6ba834774318894099cecdbe7aa5b093 | |
| parent | a4f261cf232d62a84043103e0f1ccd56e0f1c256 [diff] | |
| parent | 82c0f1c413273ddf6e04412f4502682dc81a6a20 [diff] |
am 82c0f1c4: (-s ours) am 62679a1f: (-s ours) am c095272a: (-s ours) am 7013f0c8: (-s ours) Import translations. DO NOT MERGE * commit '82c0f1c413273ddf6e04412f4502682dc81a6a20': Import translations. DO NOT MERGE