| commit | 8b5ab4a32c9bf1471ff5e1e288490b985514ff6b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Jul 24 16:58:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 16:58:16 2015 +0000 |
| tree | b3b77ef9e75baeb8c70412e3ad406c1ddc91e8ff | |
| parent | e04a4b509b7b057e6ad012562c3970648eb971c3 [diff] | |
| parent | b47a31336b95080607121ac3711e9357d08d8a98 [diff] |
am b47a3133: (-s ours) am a0018a3f: (-s ours) Import translations. DO NOT MERGE * commit 'b47a31336b95080607121ac3711e9357d08d8a98': Import translations. DO NOT MERGE