am edb3fd1f: (-s ours) am fc281601: (-s ours) am 8f4cad6f: (-s ours) am 78e92b5c: Import translations. DO NOT MERGE

* commit 'edb3fd1f29cbe7f746a8ea671314c7278d167864':
main
Baligh Uddin 2013-05-15 11:17:32 -07:00 committed by Android Git Automerger
commit 0adb427006

Diff Content Not Available