| commit | 242c36a73effff97fb0a5f637ba9e09ba655ffe8 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:57:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:57:04 2015 +0000 |
| tree | 2a8e16b5cea28e0c4830d9b5feff6a321913a161 | |
| parent | 3609078d48e2489c974b441e0b15357f556bdbad [diff] | |
| parent | 6f6fc9b4c218169fdc88c56ac86a0a20d66e239b [diff] |
am 6f6fc9b4: (-s ours) am 98aa99f7: (-s ours) am ed6f7ec1: (-s ours) Import translations. DO NOT MERGE * commit '6f6fc9b4c218169fdc88c56ac86a0a20d66e239b': Import translations. DO NOT MERGE