| commit | 51b925a64701bfdc88f193c486b83b505101fe9d | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 08 18:20:19 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 08 18:20:19 2015 +0000 |
| tree | 80089c66a944cb2913851982afebffb9b708382d | |
| parent | f790c0987e1fc18e1fab3e4a49ca92fe2e6c1810 [diff] | |
| parent | 2875b6dd763d3ede9d20dc6b3806b0e6208e6a55 [diff] |
am e3c8ed42: (-s ours) am f5e72737: (-s ours) am c8da7d53: (-s ours) am 3c573bc5: (-s ours) am 4f5630e5: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit 'e3c8ed42f4673370027ec90299f1df74ffd08ab1': Import translations. DO NOT MERGE