| commit | 2a461984694c8d552939398648e5dd4dad3db75a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 17:42:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 17:42:44 2015 +0000 |
| tree | 682c9573bbb35c71951b67674471ed8c3501ef8f | |
| parent | 82780aa20857e80f31276508ea94061de21faebb [diff] | |
| parent | fe537869e01d5461a71e13d81a8b1c3b6c2de6f1 [diff] |
am fe537869: (-s ours) am c00676c9: (-s ours) am 8b5ab4a3: (-s ours) am b47a3133: (-s ours) am a0018a3f: (-s ours) Import translations. DO NOT MERGE * commit 'fe537869e01d5461a71e13d81a8b1c3b6c2de6f1': Import translations. DO NOT MERGE