Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev

am: 7284e2a88b  -s ours

Change-Id: I90181d2ce6f3c5f65110aa53ae81e657d9894fcd
This commit is contained in:
Erik Kline
2017-06-19 08:40:21 +00:00
committed by android-build-merger

Diff Content Not Available