tree 65c4fa57d7fab06389e0901b3803a56d9b50c9fd
parent 0e06bddd566989d5c41b28ca45b538d43595059f
parent 4a2ad854ed26bba1c5beb4d849e1db07fe6aedf1
author Baligh Uddin <baligh@google.com> 1412532350 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412532350 +0000

am 4a2ad854: (-s ours) am 579a02f7: (-s ours) Import translations. DO NOT MERGE

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