tree dff58e6637b73d0d39877946d117d3519619732f
parent 5fb3fa01bc0fe9a72c2c307ee09f8ac95f9cae9d
parent 5e5811371518566cae401191923f2715c1b84798
author Baligh Uddin <baligh@google.com> 1382022967 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382022967 -0700

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

* commit '5e5811371518566cae401191923f2715c1b84798':
  Import translations. DO NOT MERGE