| commit | 08b3e18f65b9491af01cc794690e906c23f412d6 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 08 15:16:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 15:16:42 2015 +0000 |
| tree | c1dc61ea2d93ffcb9a32be19f97e2d8a485854fc | |
| parent | caa608c5c7c20cac1da671dec19f1679a3ed1cd2 [diff] | |
| parent | 9832d8bcf4f4cb812de54af7fe35ba4f7b3212cb [diff] |
am 9832d8bc: (-s ours) am 6b3db5fe: (-s ours) am 8d9ed2ae: (-s ours) am fcd59cd1: (-s ours) am 2d37dbd0: (-s ours) Import translations. DO NOT MERGE * commit '9832d8bcf4f4cb812de54af7fe35ba4f7b3212cb': Import translations. DO NOT MERGE