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