tree e155ae6eb15c0cd0274f07ef7d449598dd803df1
parent d361ca378b2ab477d422af82a195d6f0fa3a5a48
parent 38ffe89cd3b2efd64f5cca28b78dd83030baa3cf
author Android Build Merger (Role) <android-build-merger@google.com> 1499329693 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1499329693 +0000

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