| commit | d7be88dc712afbf266114d3658c34a11126f0b17 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Dec 08 18:04:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 08 18:04:07 2014 +0000 |
| tree | 97b2bfcf012f78ef560743345de00bbeb02297b5 | |
| parent | 5b41696c56c124124d48168227a83b63bd55aea7 [diff] | |
| parent | 878b49dc707961d8797ab750e78d3fb2bb048152 [diff] |
am 878b49dc: (-s ours) am 31a23f3b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev * commit '878b49dc707961d8797ab750e78d3fb2bb048152': Import translations. DO NOT MERGE