OSDN Git Service

Merge "make UpsreamNetworkMonitor the sole source of upstream network information...
authorErik Kline <ek@google.com>
Tue, 13 Jun 2017 08:36:14 +0000 (08:36 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 08:36:14 +0000 (08:36 +0000)
commit4bcce2b2efa3f7e31fcdb998581f1843e2c17725
tree74d0ca29edc2e4019878ea1b5e44097d2828875d
parente13b93c5858f7aec1609c27eec5374d3a5b0e541
parentcfaeabb3e3aad47c0f75d0b9726a93d382f305df
Merge "make UpsreamNetworkMonitor the sole source of upstream network information" am: 30a1cf96bb
am: cfaeabb3e3

Change-Id: Idfebb9b79074f21aeccf773cac98aa7839bda9da
services/core/java/com/android/server/connectivity/Tethering.java