| commit | c2ece4228d64a5621bdadc042d3182af89141f8c | [log] [tgz] |
|---|---|---|
| author | Jerome Poichet <jpoichet@google.com> | Wed Oct 01 22:02:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 01 22:02:16 2014 +0000 |
| tree | cb27a8596224028c0817441dc549001fa907096c | |
| parent | 923b627a6c69dfa99061c4c2669570ffe3a248b8 [diff] | |
| parent | 87ed04832c7562260c3a87506286d63b137daee1 [diff] |
am 87ed0483: am 0d71155d: am a5fa02df: am 72079f7f: Merge "Make sure cancel is called on tear down." into lmp-dev * commit '87ed04832c7562260c3a87506286d63b137daee1': Make sure cancel is called on tear down.