tree fa6f52d92f15ffbf563aaa38e12e108f60d90d71
parent 7116faf3db882b5189efed72b654fdce045bc529
parent 7c83a5afe8480b0941ea5d2f4d04fb5a3b2c33a2
author Baligh Uddin <baligh@google.com> 1350065439 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350065439 -0700

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

* commit '7c83a5afe8480b0941ea5d2f4d04fb5a3b2c33a2':
  Import translations. DO NOT MERGE