tree 83b461d1a1cae531068c9d2fcf23757554762f79
parent fdff96d385fdbbcb1d0a49853e89d60211a48cc7
parent 1004713867fa4476201c02c95f35c64361a6dcf2
author Baligh Uddin <baligh@google.com> 1411959644 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411959644 +0000

am 10047138: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-porkchop

* commit '1004713867fa4476201c02c95f35c64361a6dcf2':
  Import translations. DO NOT MERGE