| commit | c2d8a52393941f7019ce81c3a3a523871bd8680f | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 01 16:51:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 01 16:51:51 2015 +0000 |
| tree | 94b9d9013103b7881ad5e42257993e1cf774c6d4 | |
| parent | 2fbcdd3479df61625d80e9e025352e37cf65cd70 [diff] | |
| parent | 5d4bd09d8531141489d2ba2914ad40ef056a1466 [diff] |
am 5d4bd09d: (-s ours) am bd24631d: (-s ours) Import translations. DO NOT MERGE * commit '5d4bd09d8531141489d2ba2914ad40ef056a1466': Import translations. DO NOT MERGE