OSDN Git Service

Merge "make UpsreamNetworkMonitor the sole source of upstream network information...
authorErik Kline <ek@google.com>
Tue, 13 Jun 2017 08:49:46 +0000 (08:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 08:49:46 +0000 (08:49 +0000)
am: 72240b9eeb

Change-Id: If45443143777e1446c812563742ae8af68d8f73e


Trivial merge