tree f5f2cf38e2475ee7ef8ae40a7a0144d7856e0418
parent ec00b01d8c654fd82f57bebb822f6ef0779c49de
parent 903cc2164bba72c400be5d0e5fb0326c06e2d5e3
author Baligh Uddin <baligh@google.com> 1410886213 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410886213 +0000

am 903cc216: (-s ours) am d6c33686: (-s ours) Import translations. DO NOT MERGE

* commit '903cc2164bba72c400be5d0e5fb0326c06e2d5e3':
  Import translations. DO NOT MERGE