tree 5eb8444d9a735e8d4eadd523bfe5c31443310fc9
parent 37bcab378bddcd46602713040eeb1e1d0d3f8ef3
parent 3668323bd758481afe390eaae543129f06e755d6
author Alexandru-andrei Rotaru <rotaru@google.com> 1501774749 +0000
committer android-build-merger <android-build-merger@google.com> 1501774749 +0000

Merge "Notify the user and turn off tethering when the service is disallowed." into stage-aosp-master am: b9295c7de0  -s ours am: 7b3fd55c30  -s ours
am: 3668323bd7  -s ours

Change-Id: I8204085069cd64e881192c054e60dbc11133f07d