| commit | ff62e966b60bb20dc7c3384485816b1e7bf06057 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Jan 31 16:29:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 31 16:29:16 2014 +0000 |
| tree | d8eddacb561897b53a5c4e83be799f5624b79a87 | |
| parent | ed5d7a6f147c75c8af73328bdf816707b58afd90 [diff] | |
| parent | 149510e010b46a445355a8d7fcdb8401125b92c3 [diff] |
am 149510e0: am b9f960e0: Merge "Fixed cancel() not working correctly" * commit '149510e010b46a445355a8d7fcdb8401125b92c3': Fixed cancel() not working correctly