tree c23281d5ef96088026eae670f6d860a4417d38b8
parent 9eed8f9a5edf1338d0a36bb486dfd44d39cd9fa4
parent 2a41b761866f12f67fdf50efb76dd72e403ff1c2
author Paul Jensen <pauljensen@google.com> 1420856117 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420856117 +0000

am 2a41b761: am 60944390: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev automerge: 63e2b8e

* commit '2a41b761866f12f67fdf50efb76dd72e403ff1c2':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.