| commit | 8bcfdb707fb4ac8c44ec1f2c7483e35d5854e295 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Jun 01 17:09:42 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 01 17:09:42 2015 +0000 |
| tree | 547117f668ea31f8424844206e27f34c81ed9547 | |
| parent | d3306107df1a9ffc4fdee984d624823275cb9fa4 [diff] | |
| parent | 82df9b722e84ad1d4f6918c4e4c3136b28164581 [diff] |
am 82df9b72: (-s ours) am eb6babec: (-s ours) Import translations. DO NOT MERGE * commit '82df9b722e84ad1d4f6918c4e4c3136b28164581': Import translations. DO NOT MERGE