tree cbee2e151a4c3506dce6f6200af2d7677a3d0db0
parent f3262b319c1bd4b8f235a55bc3d8d42ef1324b62
parent a318f66144b4cbe2f70e920badc29ae70aa1854c
author Chris Phoenix <cphoenix@google.com> 1484954368 +0000
committer android-build-merger <android-build-merger@google.com> 1484954368 +0000

Merge "wpa_supplicant HAL uses "default" service name" am: fa3cb1766e
am: a318f66144

Change-Id: I03bee4e0ffb183b1601f6811e74071a5c7009a7a