tree 76c1c257e77fd84ef1bd8b013de31a4d38a3956c
parent 37749ea37032043687c7dab552d961ba6245bd08
parent 3e6b26daba924fb88e20855210e0a96e2ab0ac37
author Baligh Uddin <baligh@google.com> 1388116389 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1388116389 -0800

am 3e6b26da: (-s ours) am cff2d6a2: (-s ours) Import translations. DO NOT MERGE

* commit '3e6b26daba924fb88e20855210e0a96e2ab0ac37':
  Import translations. DO NOT MERGE