| commit | 4c0c1b47e8f4fafc005509466fe283446ee85d9c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 16:15:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 16:15:56 2015 +0000 |
| tree | 4842e0c15372ba4f73bc82ac0fe7b98b9350b5a8 | |
| parent | 03ab00f4e7fa7101f4d4f8a5ba63ad9e812150ac [diff] | |
| parent | 242c36a73effff97fb0a5f637ba9e09ba655ffe8 [diff] |
am 242c36a7: (-s ours) am 6f6fc9b4: (-s ours) am 98aa99f7: (-s ours) am ed6f7ec1: (-s ours) Import translations. DO NOT MERGE * commit '242c36a73effff97fb0a5f637ba9e09ba655ffe8': Import translations. DO NOT MERGE