| commit | de4b545e0fabbd9277dccd1f7cd043680c7f42d3 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Nov 26 19:42:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 26 19:42:15 2014 +0000 |
| tree | 60155e1f060d9fae7979b1a0b55fbf25acb60ff8 | |
| parent | 70629916864bee1cf7a0df3fa1566efa9e7c300f [diff] | |
| parent | 63aa80f6edadac1eaf245333f4762832d4cd0937 [diff] |
am 63aa80f6: (-s ours) am 57086523: (-s ours) Import translations. DO NOT MERGE * commit '63aa80f6edadac1eaf245333f4762832d4cd0937': Import translations. DO NOT MERGE