OSDN Git Service

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

Change-Id: Ia864cb26244e294b7e6a31ebfd559dd727ef7003
src/com/android/settings/wifi/WifiSettings.java