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