OSDN Git Service

Merge "Extract UpstreamNetworkMonitor to its own file" am: 8df5bd1028 am: c498f6301e...
authorErik Kline <ek@google.com>
Tue, 17 Jan 2017 06:49:24 +0000 (06:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Jan 2017 06:49:24 +0000 (06:49 +0000)
commit76835eb1459e429bcb3b3d943ea077bc550b547d
tree7770f8360ff871b044a1993341a1b33c8e2612df
parenta4655be7bb05afa9fa9d34863a070cad3508a583
parent4c9f111a6daa6865cf9b3eef484f3ae911647585
Merge "Extract UpstreamNetworkMonitor to its own file" am: 8df5bd1028 am: c498f6301e am: 55d1997d51
am: 4c9f111a6d

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