tree 59b07bb5441393513129e8ae3e156304b01cbef3
parent 4635a40596067650e618423637a88accc7ddad8a
parent c2abb6b443592cd1d070e2fa196511e2f6957077
author Baligh Uddin <baligh@google.com> 1390502500 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1390502500 -0800

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

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