| commit | b360befe91b2fbd796d40d59df128700e8f1f34c | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jul 13 15:31:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 13 15:31:44 2015 +0000 |
| tree | 52e694c3229e5e75835e536a1136039fbeb87d89 | |
| parent | b60d1c1ddbf5a0ba0d121d7691a0d84f96ad939d [diff] | |
| parent | 6b5a4a9ec132e8b3bc413b4053c2ab8fd742afbf [diff] |
am f829725a: (-s ours) am eb827719: (-s ours) Import translations. DO NOT MERGE * commit 'f829725ae8a30a8f1f403cf081e3ef5e8213ac66': Import translations. DO NOT MERGE