OSDN Git Service

Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e...
authorErik Kline <ek@google.com>
Wed, 11 Jan 2017 15:40:27 +0000 (15:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 15:40:27 +0000 (15:40 +0000)
commit96ac5e685b499b586583b9d385ac062c868b4e91
treea1772c77768f97b4c570974d0705d00d9e1052f6
parent88c43ef3aecedfcf3fbe020bfedeb9d2edccddd9
parent1559d51f86953490eeb51468d16a306de44b3bb9
Merge "Prepare UpstreamNetworkMonitor for extraction" am: f84e5e8f76 am: d48902d37e am: 305796276b
am: 1559d51f86

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