| commit | 2eccbbbc110814a2d3b0187aba3f1852eb11e235 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Apr 29 14:36:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 14:36:29 2015 +0000 |
| tree | 2fc23527898212f577e07c823feb0d3ade6d352f | |
| parent | d1a32bada1f3103973ad548c2fb65110c531798b [diff] | |
| parent | 2d954c7b46b40033161f61bebfad213f97821a8d [diff] |
am 2d954c7b: (-s ours) am eb3d1a1b: (-s ours) am 62cb506f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev * commit '2d954c7b46b40033161f61bebfad213f97821a8d': Import translations. DO NOT MERGE