tree d06ada73fa743c58226e22d2578478e0424f2dd3
parent 051723ff169ff515610fd7df89ea5ab767f83630
parent ab96af17170d7afb335035a3efbc64beb5c20258
author Baligh Uddin <baligh@google.com> 1380991260 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1380991260 -0700

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

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