tree 7650986af3bb95e2fec76cd6b730f90d116f62b9
parent d8fa1bb1f325da82ec19e4279ebcf6ecd459b1d1
parent fc9579cfda7318aefd36ec1f35b17ff9f7fd7429
author Peter Qiu <zqiu@google.com> 1483869927 +0000
committer android-build-merger <android-build-merger@google.com> 1483869927 +0000

Merge "wifi: hotspot2: Passpoint configuration APIs update" am: b1c9bc5ea5 am: fdbc827a52 am: 5549acb0e6
am: fc9579cfda

Change-Id: I5d9166a297b1fdb16d14fcd7eb83866e1be5606a