tree 4b572c5d36112f794468749d99fc40d925adaaa6
parent 4755d4212052fc7b84663ae8106cb3ed606b1c37
parent 06722826bd0b0015b9b194ef9811b806bf4baca1
author Baligh Uddin <baligh@google.com> 1414776489 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414776489 +0000

am 06722826: (-s ours) am 28491c19: (-s ours) Import translations. DO NOT MERGE

* commit '06722826bd0b0015b9b194ef9811b806bf4baca1':
  Import translations. DO NOT MERGE