tree 6952d9bd2aefe4bd7a5ec3f7182ce48427bba3f9
parent 79f50d6400406393ae98edba43e78b427d2f35c8
parent 311b2a31fa326af0091643bbe1cb9a56ac63d211
author Erik Kline <ek@google.com> 1499328715 +0000
committer android-build-merger <android-build-merger@google.com> 1499328715 +0000

Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am: b171a46d19" into stage-aosp-master
am: 311b2a31fa

Change-Id: If2fa9371bc286d2115167b8187f641ec9dfb89a9