| commit | 254a8b3548339cf7d419135197793b5b629d41d3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Jul 25 16:54:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 25 16:54:13 2015 +0000 |
| tree | cf35cbf62b7589ad36417b39d051e1186e031d51 | |
| parent | 766e85abb66b95d07fca9782dd0d12bf6a4235d1 [diff] | |
| parent | ad9001f76fcbd9e6c4af8ae90329036ee51f0f50 [diff] |
am 29f70682: (-s ours) am 819f502b: (-s ours) am 78219ac0: (-s ours) am 2487c3f0: (-s ours) Import translations. DO NOT MERGE * commit '29f70682c661083ae48a46154add6881ba3a84ec': Import translations. DO NOT MERGE