| commit | c61bd18d2b33ba12bedde61002b60086c2b0fd6b | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Sat Aug 08 14:43:10 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Aug 08 14:43:10 2015 +0000 |
| tree | 0f635324aed1783b7cde395d5a0eda0eb29e74df | |
| parent | ba5740fd914de5e14fbe7f32ca149d87e19ebeda [diff] | |
| parent | cc92ae9871acdb4d15e2badbfe37e8cdebffe639 [diff] |
am cc92ae98: (-s ours) am 2c997149: (-s ours) am ba4a568c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit 'cc92ae9871acdb4d15e2badbfe37e8cdebffe639': Import translations. DO NOT MERGE