| commit | 20ed21a5d52fe2a6b1d86bbeb3ca447d7f8aa6dc | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 08 19:44:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 19:44:33 2014 +0000 |
| tree | 8c1753be924f1ca58e84fd73c517297e2709a288 | |
| parent | d5b5576dd6565a61030d7769a44bd5189242a7e2 [diff] | |
| parent | d7be88dc712afbf266114d3658c34a11126f0b17 [diff] |
am d7be88dc: (-s ours) am 878b49dc: (-s ours) am 31a23f3b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit 'd7be88dc712afbf266114d3658c34a11126f0b17': Import translations. DO NOT MERGE