commit | d7ab93518cd045ff3013101be409cad84a8dc293 | [log] [tgz] |
---|---|---|
author | destradaa <destradaa@google.com> | Tue Sep 01 20:00:46 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 01 20:00:46 2015 +0000 |
tree | f8f4e0a216d56d6beefc74fd72ca206aba7563c6 | |
parent | d45a46549b75a5e51044d04065b2c83500029a11 [diff] | |
parent | 921f385ad92e46f13a16f3e71365a70bfcfec024 [diff] |
am 921f385a: am a3a52005: am d126f756: am ea031cb4: am 94ca8000: am 0e8d9cf1: Merge "Make tests more reliable by cleaning up worker threads on cancelation. b/17888343" into lmp-dev * commit '921f385ad92e46f13a16f3e71365a70bfcfec024':