| commit | 63bead5b12643ee593f28e80adea6f8a02080cee | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 15 13:10:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 15 13:10:14 2015 +0000 |
| tree | 17d92fadd67b4037d76382db6dd59970ff8632c0 | |
| parent | 64046e76a556f396c4551d168a4acd8e82a99481 [diff] | |
| parent | d7235ab593927347619eb28fa4da69b543c4a2cf [diff] |
am b2d17e76: (-s ours) Import translations. DO NOT MERGE * commit 'b2d17e7631161536164a9d7474a466e4243d4f37': Import translations. DO NOT MERGE