tree 76d2348d68918abc8f9f33e1a2b83723993a1684
parent ff5e5db319785d23d672af95ac2dff3f37827cfd
parent 0cc1732cfb9d68779449b4c12661b4df6bfc720b
author Paul Jensen <pauljensen@google.com> 1417721270 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1417721272 +0000

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