| commit | 06b0fb547f7ed243a61d95d3e4a5417911109428 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Nov 10 14:54:04 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 10 14:54:04 2014 +0000 |
| tree | 52053e4af6f00b0fd512f203317d3da18b698a7a | |
| parent | e5332972119319c747976f0e7dbee6388295b937 [diff] | |
| parent | 70eb9f64a695f88433d5e0b294cffc76a8e981cb [diff] |
am 70eb9f64: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev * commit '70eb9f64a695f88433d5e0b294cffc76a8e981cb': Import translations. DO NOT MERGE