am d534affc: (-s ours) am c9664084: (-s ours) am f72e1202: (-s ours) am 6aea6b9d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'd534affcdb2ebaf497111ccc8c86bdc4d4f67282':
  Import translations. DO NOT MERGE
main
Geoff Mendal 2015-07-15 17:37:16 +00:00 committed by Android Git Automerger
commit 66940fb01e

Diff Content Not Available