tree b443ad9aa983029bf388f2e50ed20f3edb3a4969
parent fa810ab3b4577e7f1f81d9549a527a8db41ffe25
parent 1c8207851cb7baa372202539260b20ef75dda1d9
author Baligh Uddin <baligh@google.com> 1411321728 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411321728 +0000

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

* commit '1c8207851cb7baa372202539260b20ef75dda1d9':
  Import translations. DO NOT MERGE