tree 1d279871a5b170d7f405dfb337d3971937730db1
parent a321f5274b2fbb45932908690a84342ce63de453
parent febf1b9c39c109c23297787dfc5fc0476e184c41
author Baligh Uddin <baligh@google.com> 1395341437 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395341437 +0000

am febf1b9c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-now-mister-ugly

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