| commit | e0bd97bf4aecae9be3e475fe7367ceeda4434a92 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 17:03:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 17:03:06 2015 +0000 |
| tree | dbee8472d8fa974dbd74a2557ae47da1a28c3832 | |
| parent | 3c8a0f30d3e397a994a18d33611d2964a85c4939 [diff] | |
| parent | 4e18fb99c8db3ef6b68df18dbcec6c5313c82470 [diff] |
am 4e18fb99: (-s ours) am 98ec64cc: (-s ours) am b778fdff: (-s ours) am 624275b5: (-s ours) Import translations. DO NOT MERGE * commit '4e18fb99c8db3ef6b68df18dbcec6c5313c82470': Import translations. DO NOT MERGE