| commit | 944c58a6bd6858627e4ed8619d06c96c72481ca8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 18:44:11 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 18:44:11 2014 +0000 |
| tree | 97d9781fe9f7a2d0d7543e829f74e62e9b15b237 | |
| parent | edfc6a0a5fb4d371272e4b4c80de22c4ff346214 [diff] | |
| parent | 6ab687e1ee0d99b6a3cdd6270eebcb24dfb7795a [diff] |
am 6ab687e1: (-s ours) am 645cf17f: (-s ours) Import translations. DO NOT MERGE * commit '6ab687e1ee0d99b6a3cdd6270eebcb24dfb7795a': Import translations. DO NOT MERGE