tree 0cfc9df21b98b61e663c32915ac8392ab9d488a4
parent b0dbb6a594eb927f30f5caeb87dafc36475cd40d
parent cbd562dae2ab272fd6939e93db82495bf8656c96
author Baligh Uddin <baligh@google.com> 1443029129 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443029129 +0000

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

* commit 'cbd562dae2ab272fd6939e93db82495bf8656c96':
  Import translations. DO NOT MERGE