tree fb59f194508169e78b3c3197c1c463b193ffea8b
parent 1a2f7a1e29e59e0c9140ac5d3f465dc110c70b48
parent 5553aeb2aeee88929b11ee3bbf8e02da1e9368bd
author Matthew Williams <mjwilliams@google.com> 1402412146 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402412146 +0000

am 3b471117: Merge "Add OnNetworkActive to TaskManager and simplify locking." into lmp-preview-dev

* commit '3b4711176e77640d697e94137e65fa93c8363f5c':
  Add OnNetworkActive to TaskManager and simplify locking.