tree 4512bce02adae0a8fdcbc22814aeda9fd90f7b00
parent d17b38d026fa58a8edd8410fb3152fc3b63a25a4
parent 476e00451968fe0388e943e83d3895298031cd09
author Baligh Uddin <baligh@google.com> 1392411769 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392411769 +0000

am 476e0045: (-s ours) am 7c4a9e55: (-s ours) am 37749ea3: (-s ours) Import translations. DO NOT MERGE

* commit '476e00451968fe0388e943e83d3895298031cd09':
  Import translations. DO NOT MERGE