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)
commit521e0f9ee095f92c1fedc33d50457da5dfe1f469
tree9cca659f188f853398a4293cb8ebebdc03bd6c8d
parent57a8d531304c3324525b0e365ae12875df54f6a6
parent72240b9eebbf240034efc8c001174269a6633dd3
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am: 30a1cf96bb am: cfaeabb3e3 am: 4bcce2b2ef
am: 72240b9eeb

Change-Id: If45443143777e1446c812563742ae8af68d8f73e