OSDN Git Service

Merge "make UpsreamNetworkMonitor the sole source of upstream network information...
authorErik Kline <ek@google.com>
Mon, 19 Jun 2017 08:40:21 +0000 (08:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 19 Jun 2017 08:40:21 +0000 (08:40 +0000)
commit6d50b1aefc835dee3c83a916a5a841bf9cb867cb
tree27a6199dcc60f1d2b6c8ead3a46d9d7d680e9dd1
parent71e07faafbf04d7c09e38873db937b13fc976c34
parent7284e2a88befa27e97979d5239b0b70ee437c6f8
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev
am: 7284e2a88b  -s ours

Change-Id: I90181d2ce6f3c5f65110aa53ae81e657d9894fcd