| commit | 38db5220aef61cade53870efc5533e1c40bef01a | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 08 13:49:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 13:49:59 2015 +0000 |
| tree | c2668ed3eb9faf84fabe69b3c7d19bdd320bf9cd | |
| parent | 10f8950a25fa4116759e52e454a7341822c19949 [diff] | |
| parent | 56f01033c262d78a6ef6b058858e4f76bb5993ef [diff] |
am 56f01033: (-s ours) am 40d4dd84: (-s ours) am 82640f6f: (-s ours) Import translations. DO NOT MERGE * commit '56f01033c262d78a6ef6b058858e4f76bb5993ef': Import translations. DO NOT MERGE