tree 9e6267039cc4d6403dab4fa6363059f4fd50eabd
parent d9a3ebd6c62221ae0e3dafd34a3e1c65d6df7208
parent 3dc73b331fda1b51a95a8ca33b3d6745dbe24ff2
author Baligh Uddin <baligh@google.com> 1408727785 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1408727785 +0000

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

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