am 0ff42b7f: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '0ff42b7f7802dacf0e67b2e64898ac2245a863ac':
  Import translations. DO NOT MERGE
main
Geoff Mendal 2015-04-22 12:53:38 +00:00 committed by Android Git Automerger
commit ac71889dfb

Diff Content Not Available