tree 2d4ff6c5c3e23fb7dae3a5f658f12551c0ac1b87
parent dfbe645bad610822299b3a2e278518efd256e21d
parent 917d49841591805a7d045ec2bd62332b67ad0faf
author Baligh Uddin <baligh@google.com> 1443150992 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1443150992 +0000

am 917d4984: (-s ours) am ae4f6218: (-s ours) Import translations. DO NOT MERGE

* commit '917d49841591805a7d045ec2bd62332b67ad0faf':
  Import translations. DO NOT MERGE