tree d8eddacb561897b53a5c4e83be799f5624b79a87
parent ed5d7a6f147c75c8af73328bdf816707b58afd90
parent 149510e010b46a445355a8d7fcdb8401125b92c3
author Narayan Kamath <narayan@google.com> 1391185756 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391185756 +0000

am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly"

* commit '149510e010b46a445355a8d7fcdb8401125b92c3':
  Fixed cancel() not working correctly