| commit | 3e2f975daecf2c25fa0c88d8e4b783ac6dd30231 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 06 22:40:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 06 22:40:25 2014 +0000 |
| tree | f9eb3a48c6339f9cd744cd98fa184bb54a9244d6 | |
| parent | f4ba3f4e87ae7384fb39c5219b29469c10c41506 [diff] | |
| parent | 8ba957f15593347ab800388a4013a0d7b38ad097 [diff] |
am 8ba957f1: (-s ours) am 13db1832: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '8ba957f15593347ab800388a4013a0d7b38ad097': Import translations. DO NOT MERGE