tree 91d1835a08f9b18d02a46c122c5b213a39338645
parent fe0bf1fbbba83e8906c3062184fe4d1dd04eac8e
parent 363a10635a64e62b9e1ec8459b9ce19a4403ebba
author Baligh Uddin <baligh@google.com> 1442632440 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442632440 +0000

am 363a1063: (-s ours) am f2ab5fed: (-s ours) Import translations. DO NOT MERGE

* commit '363a10635a64e62b9e1ec8459b9ce19a4403ebba':
  Import translations. DO NOT MERGE