tree 632e5fd720d531703b31232a55dbf5c792df1e16
parent 8553d69bf741914e3251665ad32c86c3c6bccd89
parent b17dae80c74634a8ae2d7da5f0471c829e4d6e02
author Baligh Uddin <baligh@google.com> 1383695393 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383695393 -0800

am b17dae80: (-s ours) am 4c900d88: (-s ours) Import translations. DO NOT MERGE

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