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

* commit '0a12c0d82a3364c5d5413ae4dae179805496cd04':
  Import translations. DO NOT MERGE
main
Geoff Mendal 2015-02-27 16:46:54 +00:00 committed by Android Git Automerger
commit 0e5a4332fa

Diff Content Not Available