am 417f3758: (-s ours) am c73fabf6: (-s ours) am b8d881f2: (-s ours) am cce9728e: (-s ours) am cf849b40: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '417f375851d1808dcea9a9b301c9055e49f99914':
  Import translations. DO NOT MERGE
main
Geoff Mendal 2015-07-15 17:49:06 +00:00 committed by Android Git Automerger
commit 6d71a22441

Diff Content Not Available