tree 5bfb134fdd085f04036fe3a589239a81bd74b9fb
parent 750dd5869d2ff004e2ea2b3fed30dcc8e63a5080
parent 26f4cfbe018c482f8b332912f6cac7e629cc88e0
author Baligh Uddin <baligh@google.com> 1412531193 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412531193 +0000

am 26f4cfbe: (-s ours) Import translations. DO NOT MERGE

* commit '26f4cfbe018c482f8b332912f6cac7e629cc88e0':
  Import translations. DO NOT MERGE