tree f83ea62823cb6006a82bc432934a3980906eafd6
parent ae9358ef5e3a3e016469ebd6b810ab504e4e10dd
parent bf83288b5ad2c41379fb3abc36acb51af40ceb79
author Baligh Uddin <baligh@google.com> 1380599699 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380599699 -0700

am bf83288b: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

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