tree 782587a3ae0fe931a61ea175c752c20dae5d092e
parent 8ff1952eadbc226e1efe389ef411ad097af78c29
parent 5826cfe57a25c3aa732d7f3bfdb6f418f7c20101
author Baligh Uddin <baligh@google.com> 1443387299 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443387299 +0000

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

* commit '5826cfe57a25c3aa732d7f3bfdb6f418f7c20101':
  Import translations. DO NOT MERGE