| commit | 670973a834d622644456ceee7676072361f48968 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Apr 01 10:28:45 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 01 10:28:45 2015 +0000 |
| tree | 9aafb2cc77edf8083b8a46aed81882c48d5addc5 | |
| parent | 31dd2c688bee2e99209d2fce4db69fc67c4c61ff [diff] | |
| parent | 47121c5e1e42e68345b6b994091904549509cfe4 [diff] |
am 47121c5e: (-s ours) am 22c93045: (-s ours) am 568039dd: (-s ours) Import translations. DO NOT MERGE * commit '47121c5e1e42e68345b6b994091904549509cfe4': Import translations. DO NOT MERGE