am 311c99b4: (-s ours) am 22de9d07: (-s ours) am aef36570: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '311c99b4868c10cb4f2c7f9130990d271c0bf8ec':
  Import translations. DO NOT MERGE
main
Geoff Mendal 2015-02-27 16:53:19 +00:00 committed by Android Git Automerger
commit 9d2229b9ba

Diff Content Not Available