OSDN Git Service

Merge \"Fix tethering re-enable after edit.\" into nyc-dev
authorJason Monk <jmonk@google.com>
Wed, 22 Jun 2016 15:26:29 +0000 (15:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 15:26:29 +0000 (15:26 +0000)
am: dbb5a0b918

Change-Id: Ib8547ccf2a169c16b6bb0785e7094edbee123af0


Trivial merge