tree a227d665235caaa09c8d29e3e34621db5f279c21
parent 12e6eea983e5b077b28a67b421327335324aee39
parent 0cf6dffdbe8c375083061f701567cb487745cd86
author Peter Qiu <zqiu@google.com> 1489510771 +0000
committer android-build-merger <android-build-merger@google.com> 1489510771 +0000

Merge "WiFiInstaller: update usage of WifiManager#addOrUpdatePasspointConfiguration" am: 8ca5dd86cd am: 67344dd5e0
am: 0cf6dffdbe  -s ours

Change-Id: Idd696986f906e9a8d390ced1f116171bac656c50