tree bd81b501549e822c60f71535da292f755eb78dd1
parent 91b90c09af3fbd26e5dacc451bc4547c0042a37e
parent e1bc195119abc44f1bea5a08f9f37f43696dd916
author Baligh Uddin <baligh@google.com> 1381585821 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381585821 -0700

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

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