| commit | 7e89b6b8e623977f015ee6b848d449e47ab696a0 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 16:02:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 16:02:29 2015 +0000 |
| tree | b0331544e3229fe8c5d1765dd38002a14771d2a6 | |
| parent | b6710a9f15a9535706755ad960a00e7bc1c4aa1f [diff] | |
| parent | 475b4432e1087634e193a3de5051e6d5a48f932d [diff] |
am 475b4432: (-s ours) am 9ebc9463: (-s ours) am 9942e6f2: (-s ours) am 3c46e939: (-s ours) Import translations. DO NOT MERGE * commit '475b4432e1087634e193a3de5051e6d5a48f932d': Import translations. DO NOT MERGE