tree 2ecd5ddffa1f5929b2d7c3037b57669cfc158c82
parent 461c46ca306a1c2d5c068211adffd94d39a89f0f
parent bab13dba5ab8dc91ed7782945948a81b6e8ecc69
author Baligh Uddin <baligh@google.com> 1379220634 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379220634 -0700

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

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