| commit | 2e0be060b9f1a9ac5014ba73080a43bbd815fa9d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:09:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:09:34 2015 +0000 |
| tree | d14ba40cf46738e40d7947a078dd587dfb440fba | |
| parent | 16b59a16d7b0f90669ec08e58016a452da7f9126 [diff] | |
| parent | 37e1df349aa76d79dca0c379ab1768dcec50ea94 [diff] |
am 37e1df34: (-s ours) am efaf2ac0: (-s ours) Import translations. DO NOT MERGE * commit '37e1df349aa76d79dca0c379ab1768dcec50ea94': Import translations. DO NOT MERGE