tree 0ab9f5066e7fe522540774e39282baffb608138f
parent 0158c3787526ed3d901cb1a5faf397cb7757c9ab
parent 2cfd2cdd9a83da99a043b0668852900982243e2b
author Baligh Uddin <baligh@google.com> 1410882015 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410882015 +0000

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

* commit '2cfd2cdd9a83da99a043b0668852900982243e2b':
  Import translations. DO NOT MERGE