tree b840085987c74d6dce33f07d9b4c91c5049b160a
parent d0ab6d6dbf948fc04ec12467ae85513650a4ff14
parent a5fa02dfa8ae6e2a8cfab6489ada400f8c33f455
author Jerome Poichet <jpoichet@google.com> 1412176572 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412176572 +0000

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.