| commit | 938cf6f863cdbead814d27a7f6647d1fcc79474e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Aug 31 14:35:52 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 31 14:35:52 2015 +0000 |
| tree | bc93fc373e76e2fdc0fa71eff166ea8dc27afc46 | |
| parent | 7baf9a3e8a7c9c7e27262bc30cdccdde049bf031 [diff] | |
| parent | 9cc1143d8f7e7810b73516f0797558c09614c477 [diff] |
am 9cc1143d: (-s ours) am 0e6d3846: (-s ours) am f33098ea: (-s ours) Import translations. DO NOT MERGE * commit '9cc1143d8f7e7810b73516f0797558c09614c477': Import translations. DO NOT MERGE