OSDN Git Service

Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in...
authorErik Kline <ek@google.com>
Thu, 6 Jul 2017 08:44:04 +0000 (08:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 6 Jul 2017 08:44:04 +0000 (08:44 +0000)
commitc190be168ea297dfad3d83a5ca061a1d540b6a4a
tree2078db606f8b289935b2472e8d409d819bfbbbe6
parent38efafbea755b1bd6eb97629167c140f00e8cd11
parentb3c41d55d5193525e2f73de335d1e92f93b128c6
Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master am: 311b2a31fa" into oc-dev-plus-aosp am: d29b77a59e  -s ours" into oc-dr1-dev-plus-aosp
am: b3c41d55d5  -s ours

Change-Id: I50ef47618b4bf6b277eb02c331318594647ba5e9