tree 30e8a75a236f4a2a0f10710ad887216c2085f7d5
parent ab96af17170d7afb335035a3efbc64beb5c20258
parent a4baa5ae36b83d94090d6552d32d9362984a4c39
author Baligh Uddin <baligh@google.com> 1381018280 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1381018280 -0700

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

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