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

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

* commit '72af7f8ddd2b13456c5e32b0e79390d6d5be163d':
  Import translations. DO NOT MERGE