tree 16bae1714534229680e62853d70a282d203819ac
parent 26c551aaa615a2af3ee8db240fc6f7d65c5532d6
parent 09c3547a257de63a2666d160740cc506dd8f75ce
author Baligh Uddin <baligh@google.com> 1442631854 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442631854 +0000

am 09c3547a: (-s ours) Import translations. DO NOT MERGE

* commit '09c3547a257de63a2666d160740cc506dd8f75ce':
  Import translations. DO NOT MERGE