tree 1f6336ec4ca8fdac2b626336374e17f2a28a4ae2
parent b5e4dc4c727cdec4a28087035df33ba187cf2f69
parent 0e8d9cf18bcc2317785bf74d2e2bacb107f7d5e1
author destradaa <destradaa@google.com> 1413309183 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413309183 +0000

am 0e8d9cf1: Merge "Make tests more reliable by cleaning up worker threads on cancelation. b/17888343" into lmp-dev

* commit '0e8d9cf18bcc2317785bf74d2e2bacb107f7d5e1':
  Make tests more reliable by cleaning up worker threads on cancelation. b/17888343