am 180a1e36: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '180a1e363f84f425e1b1d001e15e28df03f9181e':
  Import translations. DO NOT MERGE
main
Geoff Mendal 2015-03-16 13:10:21 +00:00 committed by Android Git Automerger
commit 860107d9de

Diff Content Not Available