OSDN Git Service

Merge "Restrict changing wi-fi networks" into oc-dr1-dev am: a7e10e0316
authorChristine Franks <christyfranks@google.com>
Wed, 26 Jul 2017 02:59:16 +0000 (02:59 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 02:59:16 +0000 (02:59 +0000)
am: a1f56b5faa

Change-Id: Idc0678e98f9606b991eb82c45f3c53dc65663905


Trivial merge