tree 782587a3ae0fe931a61ea175c752c20dae5d092e
parent b7049eaef9258d28eea01145337006065f3fc2d5
parent 07388a5f045c2688d602e0521455dc7c84adade2
author Baligh Uddin <baligh@google.com> 1442631857 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442631857 +0000

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

* commit '07388a5f045c2688d602e0521455dc7c84adade2':
  Import translations. DO NOT MERGE