| commit | 2f45b7aba9b1590774d1e1855bb9d1df69c504b9 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jan 07 14:39:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jan 07 14:39:51 2015 +0000 |
| tree | c3f4af8b6a50f3eb439d3959929785ffff20d198 | |
| parent | ab9a7e2bfeee837a5ebeb86779ac3f4c66e3ed67 [diff] | |
| parent | 634b17063b79167ae0c0459afa7b528d933c4011 [diff] |
am 634b1706: (-s ours) am 0347196c: (-s ours) am 1dcc3e5c: (-s ours) Import translations. DO NOT MERGE * commit '634b17063b79167ae0c0459afa7b528d933c4011': Import translations. DO NOT MERGE