tree 45443ee98eec89b959aee5510137c0d03f4b4272
parent 65fe7114dbf316005c9a65961457f0f861fe2d4a
parent 4abb94af4bec8702dc18fcc6e88c7f60f1d332db
author Baligh Uddin <baligh@google.com> 1400729063 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400729063 +0000

am 4abb94af: (-s ours) am 87b440b9: (-s ours) Import translations. DO NOT MERGE

* commit '4abb94af4bec8702dc18fcc6e88c7f60f1d332db':
  Import translations. DO NOT MERGE