tree 261f2423305ca6aa56586472176eb71de9f88788
parent cfc4e218991f1d956631b30afd4fd8d6a0fd2882
parent 082263344a554e409c9376c6a6101db2b0cccba4
author Erik Kline <ek@google.com> 1484217806 +0000
committer android-build-merger <android-build-merger@google.com> 1484217806 +0000

Merge "Simplify UpstreamNetworkMonitor callback handling" am: f9f5cf9d9b am: cbd3d8b356
am: 082263344a

Change-Id: I11af9d4b1810cce628e240f2d8b6980ea55cd40a