tree 7df7c6704bf90ebd2ebd3c729e99d08d9e246c46
parent 53134e88701c417ce4371de67828afcf75295d8d
parent c6d164b5b99ca5d50dbd0723b61fdf4476954d50
author Baligh Uddin <baligh@google.com> 1404671462 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404671462 +0000

am c6d164b5: (-s ours) am deb33ab8: (-s ours) am aaebc99e: (-s ours) am 7f0a85d0: (-s ours) Import translations. DO NOT MERGE

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