| commit | 81bbb1aef874dd538942171be33c525d205b43ab | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon May 25 13:46:38 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 25 13:46:38 2015 +0000 |
| tree | 434a20086607e74a788672bbca71f1df17bdfa2a | |
| parent | 8868304a14bd1af3718b2f8175df1b7a2161612a [diff] | |
| parent | f442fb7d0a919a5b83a39b148f50acbda29fad7c [diff] |
am f442fb7d: (-s ours) am 4a1e2d45: (-s ours) am 2e1bfd30: (-s ours) Import translations. DO NOT MERGE * commit 'f442fb7d0a919a5b83a39b148f50acbda29fad7c': Import translations. DO NOT MERGE