| commit | fb4c06dafb8c4d04e94f26f3c59d351103f340db | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 08 19:43:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 19:43:32 2014 +0000 |
| tree | d4e0d3371318160289e8937d293f292afbeb842a | |
| parent | 4df464d053669392e1f1c235744ff5359b9f84cd [diff] | |
| parent | fb293b9f9d7d7adb6936f526c4af9d20616c8f62 [diff] |
am fb293b9f: (-s ours) am 9eb2092e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit 'fb293b9f9d7d7adb6936f526c4af9d20616c8f62': Import translations. DO NOT MERGE