| commit | ad12f288b1199b636c3961bb86fd11ed2749065e | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Mon Oct 13 18:48:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 13 18:48:03 2014 +0000 |
| tree | 64d0760dadd967e7c80a720348d2fb4f35e9c3d9 | |
| parent | 1b77f365d63828e5111a1bec6495a06c07154771 [diff] | |
| parent | 02c4a225ffa32e67255517a0275d7a4c1a738619 [diff] |
am 02c4a225: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev * commit '02c4a225ffa32e67255517a0275d7a4c1a738619': Import translations. DO NOT MERGE