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