tree a36bf269b01ca238a0e774d24bc863eaf23e0034
parent 8ade276115e00828cf5de7f0acb6e8c62ac30ecd
parent 1228b6cdecdfffbaf84e569061bf4ad4ce50f447
author Peter Qiu <zqiu@google.com> 1489707592 +0000
committer android-build-merger <android-build-merger@google.com> 1489707592 +0000

Merge "wifi: add a flag indicating legacy Passpoint configuration" am: 2d87679a11
am: 1228b6cdec

Change-Id: Ifc293108dfdfb503ab7596da657e9768a8fea25d