tree 3d2292e010d89cde4216e7db859c10994b27db6e
parent 29e4b2bc305a23e76c7ad2498aab0b598ae0cd91
parent dbb5a0b9182c34d0d2c88cb4ff89edd06e31b1ff
author Jason Monk <jmonk@google.com> 1466609796 +0000
committer android-build-merger <android-build-merger@google.com> 1466609796 +0000

Merge \"Fix tethering re-enable after edit.\" into nyc-dev
am: dbb5a0b918

Change-Id: Ia9f2e65710a94f314f8bb2b8ec875088c9ccc59f