am 02c00cb1: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '02c00cb1975e99893602dcdda33a4f0efc4988fb':
  Import translations. DO NOT MERGE
main
Geoff Mendal 2015-04-22 12:53:40 +00:00 committed by Android Git Automerger
commit fab5168591

Diff Content Not Available