tree cd29733e0f86bf9d39651174a571c9f382016f97
parent ea7e18b44a5a5de5d1ca8a7ac9a78ec742b10bd9
parent 8edf8df8153ab68cd36c0fbfb9b4a287f94de16b
author Baligh Uddin <baligh@google.com> 1379391748 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379391748 -0700

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

* commit '8edf8df8153ab68cd36c0fbfb9b4a287f94de16b':
  Import translations. DO NOT MERGE