tree eef6054084446dbba99fd39dfee7162ae96672bf
parent 3e17992027f0406752a20fa824c53608653b5435
parent 35957dbd62e89049f7140d0eca7343285eb3a9ce
author Baligh Uddin <baligh@google.com> 1412531896 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412531896 +0000

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

* commit '35957dbd62e89049f7140d0eca7343285eb3a9ce':
  Import translations. DO NOT MERGE