am 0e5a4332: (-s ours) am 0a12c0d8: (-s ours) am e245b27a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '0e5a4332fad16682a0c3dec829e0bc899b8cb635':
  Import translations. DO NOT MERGE
main
Geoff Mendal 2015-02-27 16:53:17 +00:00 committed by Android Git Automerger
commit b25977ed74

Diff Content Not Available