OSDN Git Service

Merge "Start of tethering OffloadController" am: 121006f428 am: 4568fa4a82
authorErik Kline <ek@google.com>
Tue, 7 Mar 2017 02:57:10 +0000 (02:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 7 Mar 2017 02:57:10 +0000 (02:57 +0000)
commit108a492d7f97827d377228eb35ab05b340ca39cd
treef0bd2ddcfd4595efa898ed37996edf9db1a8dd30
parent718c59bbbbc5e1c6a19128c7acd08f8eda685eeb
parentafc5f223e998c11c30aeabc97a5110dbfa050c27
Merge "Start of tethering OffloadController" am: 121006f428 am: 4568fa4a82
am: afc5f223e9

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