OSDN Git Service

Merge "make UpsreamNetworkMonitor the sole source of upstream network information...
authorErik Kline <ek@google.com>
Mon, 19 Jun 2017 08:50:49 +0000 (08:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 08:50:49 +0000 (08:50 +0000)
am: 6d50b1aefc  -s ours

Change-Id: I9e7d7dfdd09a31018421ed904da5665ff526ca3f


Trivial merge