tree d06ada73fa743c58226e22d2578478e0424f2dd3
parent 40d9d468c34fd6b3ff3a015fc83cf9862138f190
parent fe44eaf033e28c388f7b7ff66d37cd5b859b6a09
author Baligh Uddin <baligh@google.com> 1382023790 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1382023790 -0700

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

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