OSDN Git Service

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

Change-Id: I7589fb8ca10497b81736de29a4c6461723f06a93


Trivial merge