tree 656c908766fd31868501e2de6d3732a8c8013733
parent db6166572c12df99735a84b02541aa0063d6d0ff
parent e336ebc903d13e10eb73761e5e6aab90676da82b
author Baligh Uddin <baligh@google.com> 1383693554 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383693554 -0800

am e336ebc9: (-s ours) Import translations. DO NOT MERGE

* commit 'e336ebc903d13e10eb73761e5e6aab90676da82b':
  Import translations. DO NOT MERGE