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)
commit0fdea11fbe9ee237e3cd9264ee6110cb921f30a5
treea120f8a7e82b53e6c66571552f2bf646c6c23c42
parent9b85471c0c12a803ba105c032126469bd4eb2ff2
parent6d50b1aefc835dee3c83a916a5a841bf9cb867cb
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" into oc-dr1-dev am: 7284e2a88b  -s ours
am: 6d50b1aefc  -s ours

Change-Id: I9e7d7dfdd09a31018421ed904da5665ff526ca3f