| commit | 15579b8d972cc0b986d8fd39debaede674ae0bce | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Tue Jul 14 21:18:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 14 21:18:38 2015 +0000 |
| tree | d1c6da166b81a3bf20714253d016aceac438baa8 | |
| parent | 801d5289e434f2d8c1ce85f9bda3d9cd41117d0a [diff] | |
| parent | 4e3575eb98e1b60600a9146862ab190491eec035 [diff] |
am 4e3575eb: (-s ours) am 4c77d6a7: (-s ours) Import translations. DO NOT MERGE * commit '4e3575eb98e1b60600a9146862ab190491eec035': Import translations. DO NOT MERGE