tree 7ab926c1d670417ccd4b8581c9bf49bb78d5d357
parent 0effb652ec7f24a892fe98b16b0eebc6d2e7c12e
parent 89fbe00de978c9620e71a030fa0f16cecfd38b3a
author Baligh Uddin <baligh@google.com> 1383797468 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1383797468 -0800

am 89fbe00d: (-s ours) am 0491f0f1: (-s ours) Import translations. DO NOT MERGE

* commit '89fbe00de978c9620e71a030fa0f16cecfd38b3a':
  Import translations. DO NOT MERGE