tree d3148a5d8d26c3d6cf6a8a55a69c0f77887a143b
parent c4d91cf373851ddf872738838bcaca3b8ece8b2b
parent 874147310f827f10640e7a2bba490d0b6ffe8a8e
author Baligh Uddin <baligh@google.com> 1379220412 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379220412 -0700

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

* commit '874147310f827f10640e7a2bba490d0b6ffe8a8e':
  Import translations. DO NOT MERGE