| commit | 0e3ffe7cce1ceeac9eeac839d41db40ba983f97d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 12 13:00:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 12 13:00:56 2015 +0000 |
| tree | fa8071070f885f177115aa1efe335fb42e775699 | |
| parent | 3963b980bebacb58dd2ed57fd45b042a01f125a0 [diff] | |
| parent | 5fa0a93d3ed1ad838fd43a41f4df9703ae206345 [diff] |
am 5fa0a93d: (-s ours) am 4fedc0fd: (-s ours) Import translations. DO NOT MERGE * commit '5fa0a93d3ed1ad838fd43a41f4df9703ae206345': Import translations. DO NOT MERGE