| commit | 069bf3c2a41a0c97b31602309965f28293b59200 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 14:19:00 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 14:19:00 2015 +0000 |
| tree | 8a9b9526a498f0170bfe70986bf3e4e524ba46df | |
| parent | b109b1349a50e14ab52d013e6d5dde5db3d7ab67 [diff] | |
| parent | 234bd0f46c9d75240906fa021b8c4975a34c9c10 [diff] |
am 234bd0f4: (-s ours) am b568f3fd: (-s ours) Import translations. DO NOT MERGE * commit '234bd0f46c9d75240906fa021b8c4975a34c9c10': Import translations. DO NOT MERGE