tree 92fe12e72d8694623dbca53c484245018ee36139
parent 546feca249dfdef106a7d2150c1a0cd74c1f8bbb
parent e0d330f13857e6eabdea10184c7c38445e943b22
author Jason Monk <jmonk@google.com> 1466609519 +0000
committer android-build-merger <android-build-merger@google.com> 1466609519 +0000

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

Change-Id: Ic67c1ed8a63103476b2579179374ab405e98b3b6