| commit | 0d71155d42e09e62456505bcff4e1dfe02ba9b32 | [log] [tgz] |
|---|---|---|
| author | Jerome Poichet <jpoichet@google.com> | Wed Oct 01 15:16:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 01 15:16:12 2014 +0000 |
| tree | b840085987c74d6dce33f07d9b4c91c5049b160a | |
| parent | d0ab6d6dbf948fc04ec12467ae85513650a4ff14 [diff] | |
| parent | a5fa02dfa8ae6e2a8cfab6489ada400f8c33f455 [diff] |
am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev * commit 'a5fa02dfa8ae6e2a8cfab6489ada400f8c33f455': Make sure cancel is called on tear down.