tree cb8293d38995954744dad77db17fe0f213b42040
parent ebb46f0e8506e619ebfad3c8bc0447e57349a4af
parent a16a3cf06722fc244371197663c4eca0e04994d7
author Peter Qiu <zqiu@google.com> 1485919451 +0000
committer android-build-merger <android-build-merger@google.com> 1485919451 +0000

Merge "WifiInstaller: use updated PasspointConfiguration APIs" am: b2d845283e
am: a16a3cf067

Change-Id: I57d8472a9813cce515880cc61771bba6df3a2935