tree 19ab8bca32a31b13d1cd672de84982b6d85cb8d4
parent a28465395bc661b750c7276e5028a17034e3edba
parent 32531e01a27e56cd2bbe045237c98de1b4e3ab4a
author Baligh Uddin <baligh@google.com> 1442632437 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442632437 +0000

am 32531e01: (-s ours) am 9ef49eca: (-s ours) Import translations. DO NOT MERGE

* commit '32531e01a27e56cd2bbe045237c98de1b4e3ab4a':
  Import translations. DO NOT MERGE