| commit | 53cadf1f7cf079f6316e66b20fe1881662b71860 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Fri Mar 20 23:12:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:12:54 2015 +0000 |
| tree | 648b1d3d905516553b8a4d7062ab5a96d317d54b | |
| parent | 578ad3ede955d68b3552352537dd95459f5840de [diff] | |
| parent | f91ce1bd76e139553ad2e02af82a479b24a9211b [diff] |
am f91ce1bd: (-s ours) am 9e8b64cd: (-s ours) am f5334715: (-s ours) Import translations. DO NOT MERGE * commit 'f91ce1bd76e139553ad2e02af82a479b24a9211b':