| commit | 88af84ec52f7d88dc76610368076ed1bdad641b4 | [log] [tgz] |
|---|---|---|
| author | Geoff Mendal <mendal@google.com> | Wed Jul 22 16:50:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jul 22 16:50:50 2015 +0000 |
| tree | f5e1ae19cf78377ccf620ab4d9ba8014ecfbf707 | |
| parent | fd1aee70a3555bdd3f9c96a0e402507cb29a0b13 [diff] | |
| parent | 176df28256f2657f933235d99cf3247081b02f42 [diff] |
am 176df282: (-s ours) am 1e06d4c6: (-s ours) am 5c080bd2: (-s ours) am c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev * commit '176df28256f2657f933235d99cf3247081b02f42': Import translations. DO NOT MERGE