OSDN Git Service

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

Change-Id: Ifcb15f741c4bcb72c32789870bc50027d2fc4cbb
src/com/android/settings/Utils.java
src/com/android/settings/wifi/WifiSettings.java
tests/robotests/src/com/android/settings/UtilsTest.java