tree 9fb0ef2b2284afc08ff93ee4a9eb705e96a68462
parent 2fa9142e1181ba265b3e06adf01dd6ba1f311863
parent a21c211034dc082a040cbed0e3f2be5f14556dd2
author Baligh Uddin <baligh@google.com> 1393348083 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1393348083 -0800

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

* commit '18cd7052bc629b38941dc0b3bb06335604f0342e':
  Import translations. DO NOT MERGE