tree 128bb85a92cc0c7840346847b9ac0abfb45d7973
parent dc08285150c208fb473e1b01e3f09227d79822f7
parent 313693b044331c02870f1259552ee28b442cf869
author Baligh Uddin <baligh@google.com> 1392411652 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411652 +0000

am 313693b0: (-s ours) am afce72a1: (-s ours) am 10daf361: (-s ours) am 0b4a8442: (-s ours) am 91c7f77d: (-s ours) am 29cff2d2: (-s ours) Import translations. DO NOT MERGE

* commit '313693b044331c02870f1259552ee28b442cf869':
  Import translations. DO NOT MERGE