| commit | f51a45960848ed55f92ded99734acb33588d1918 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Thu Aug 27 11:21:11 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:21:11 2015 +0000 |
| tree | 8924d31ff2ecb8b544ab35dab62f515aac397156 | |
| parent | 7edf5eebd2c409472fda3e5ee3a197f299611043 [diff] | |
| parent | f484bb16b97e76d8ed96bc918edabc4323166786 [diff] |
am f484bb16: (-s ours) am 624275b5: (-s ours) Import translations. DO NOT MERGE * commit 'f484bb16b97e76d8ed96bc918edabc4323166786':