| commit | 628ea742c899f8d265010fa48eb119f7de905f7e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Feb 25 17:26:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 25 17:26:40 2015 +0000 |
| tree | dfa7bb9f144869f7fe6266887195fec9ddc1f040 | |
| parent | 3f6809452d22b7a32248212b24b90e7b739fa7e1 [diff] | |
| parent | dd535604fc1e77da28a259a9e9e073efa5618f17 [diff] |
am dd535604: (-s ours) am 53ddd69e: (-s ours) Import translations. DO NOT MERGE * commit 'dd535604fc1e77da28a259a9e9e073efa5618f17': Import translations. DO NOT MERGE