| commit | f484bb16b97e76d8ed96bc918edabc4323166786 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 16:25:35 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 16:25:35 2015 +0000 |
| tree | dbee8472d8fa974dbd74a2557ae47da1a28c3832 | |
| parent | c180d61bbd0412616624843c3d65e144217211e9 [diff] | |
| parent | 624275b5ff31979a045a75eb0b4c2e3893b1ef4b [diff] |
am 624275b5: (-s ours) Import translations. DO NOT MERGE * commit '624275b5ff31979a045a75eb0b4c2e3893b1ef4b': Import translations. DO NOT MERGE