am 2af3fc32: (-s ours) am 25b6185d: (-s ours) am 19eefc51: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master

* commit '2af3fc327552fed412a583e72d0969aa2d5b6e4d':
  Import translations. DO NOT MERGE
main
Baligh Uddin 2014-10-31 17:21:02 +00:00 committed by Android Git Automerger
commit c902e8e5cd

Diff Content Not Available