| commit | 9966d5ee4abd6298b6a13f7a8805f7209759aa60 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 29 23:07:26 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 29 23:07:26 2015 +0000 |
| tree | 6dbde7613af6b9569e8c90a53d388858a335a2b4 | |
| parent | d8c43dc1b9221bfc6f79d8a74ce3de85decdddf9 [diff] | |
| parent | 914952d44fe60a33dd68dec5b351bff5283c7b4a [diff] |
am 914952d4: (-s ours) am 6d081cbe: (-s ours) am 467219b9: (-s ours) am 44b49aef: (-s ours) Import translations. DO NOT MERGE * commit '914952d44fe60a33dd68dec5b351bff5283c7b4a': Import translations. DO NOT MERGE