tree 6f34b07cc337a34ee3ceccab31a47297df1c7368
parent bf5c5ab85e6c6167f11eddfa25a0bc87faab019f
parent 81d2581dbaf17f786602517c14b7ea7317f80fd0
author Baligh Uddin <baligh@google.com> 1388102069 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1388102069 +0000

am 81d2581d: (-s ours) am 56f7f8ad: (-s ours) am ab2e1975: (-s ours) am 7636a56d: (-s ours) Import translations. DO NOT MERGE

* commit '81d2581dbaf17f786602517c14b7ea7317f80fd0':
  Import translations. DO NOT MERGE