am 3d4dc269: (-s ours) am edaa9be7: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '3d4dc2694f18d4301604d1fee72292afef2cf3a0':
main
Baligh Uddin 2013-09-26 06:01:34 -07:00 committed by Android Git Automerger
commit ad394f80d0

Diff Content Not Available