tree c5f8b9a4af60c235e6f178ad76892219e84d8a8e
parent 56f3c8eb3d56d6d7acff2103aba258eb9480c1e1
parent cba166d38004482f04b1b406b0a4ec8933daea9d
author Rebecca Silberstein <silberst@google.com> 1496182281 +0000
committer android-build-merger <android-build-merger@google.com> 1496182281 +0000

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

Change-Id: Ie639b844ab810386e8f0203e2978bf07453e35bd