| commit | 4b04ac43ac40da458516be5407ea2bcf5358c852 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 23:00:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 23:00:41 2015 +0000 |
| tree | 87ab5a7346eb4679192e5ad1f0602de8143c9455 | |
| parent | 1192fa45b12088cde38b5803c87d3fb13dc57c3b [diff] | |
| parent | 42c48ba7231bd38aa4e2128be62d9781d8bc7ba5 [diff] |
am 42c48ba7: (-s ours) Import translations. DO NOT MERGE * commit '42c48ba7231bd38aa4e2128be62d9781d8bc7ba5': Import translations. DO NOT MERGE