tree fa6f52d92f15ffbf563aaa38e12e108f60d90d71
parent e4b91b6bfd37bc5e3a73032f6e5f39a74d739381
parent 75e83c68f24aabd132a34a0502096df8c6c833b8
author Baligh Uddin <baligh@google.com> 1350065439 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350065439 -0700

am 75e83c68: (-s ours) am 0b28710b: Import translations. DO NOT MERGE

* commit '75e83c68f24aabd132a34a0502096df8c6c833b8':
  Import translations. DO NOT MERGE