| commit | 61a490837cd54c6e31de74b35762f7cbb0a85d80 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 12 12:52:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 12:52:36 2015 +0000 |
| tree | 9455cde495d658f78e2d561a60a374b59c021595 | |
| parent | 192248cc9a66929c22f49757644564f078515c15 [diff] | |
| parent | 30d1619a4472537317eb99a46c6ef3eb08e6c225 [diff] |
am 30d1619a: (-s ours) am c483a5e3: (-s ours) am 5a761be3: (-s ours) am 7d521a8f: (-s ours) am f598d0bc: (-s ours) Import translations. DO NOT MERGE * commit '30d1619a4472537317eb99a46c6ef3eb08e6c225': Import translations. DO NOT MERGE