tree b024eb9aa9f55e43d2a9ab3b6cf198ada97a7938
parent 0ddfc5f000a6e09d203eb846c6d0baaf4ae52daf
parent 07fc5a31b376e00569f217b97668f247be5ffec7
author Baligh Uddin <baligh@google.com> 1396388253 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396388253 +0000

am 07fc5a31: (-s ours) Import translations. DO NOT MERGE

* commit '07fc5a31b376e00569f217b97668f247be5ffec7':
  Import translations. DO NOT MERGE