tree b6bef76becf18b68fe262b91a0fad33f38b5b854
parent 30f2fc6a29ac819522ba70fa76135f86ad94a0dd
parent e58e81d943b65e9334b39d0eb204c2e1a530a2ba
author Baligh Uddin <baligh@google.com> 1353107746 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1353107746 -0800

am e58e81d9: am de4a6310: Import translations. DO NOT MERGE

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