tree 18cf7143321349d6d398ef6997b2a4bbda074bb3
parent b60bb35650c7075bc66bf2b8f5c0fbe428092010
parent 60944390cde10c44064f1eda67eae5d76598f0d8
author Paul Jensen <pauljensen@google.com> 1420855566 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420855566 +0000

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

* commit '60944390cde10c44064f1eda67eae5d76598f0d8':
  Remember to cancel lingering when a network again satsifies a NetworkRequest.