tree bf526848dd05e64abf2f3c16e168c003c5e14cb5
parent 91df0c9a035c3ddc68667719736a7bd83f25e368
parent bbc260d4082dbde09059b577e569e002369eb243
author Rebecca Silberstein <silberst@google.com> 1496181738 +0000
committer android-build-merger <android-build-merger@google.com> 1496181738 +0000

Merge "SettingsAppWidgetProvider: do not use setWifiApEnabled" into oc-dev
am: bbc260d408

Change-Id: Iec61f95ab0c0e77e280461f3142e6b878725cc7d