tree 4258fe27ce012de28d596a92d54ec097ced2b4f7
parent 33077b18208aab987e14cd26f0f501c7666a89ff
author Dmitry Shmidt <dimitrysh@google.com> 1361998560 -0800
committer Dmitry Shmidt <dimitrysh@google.com> 1361998560 -0800

Accumulative patch from commit f8361e3d681e55efead2aac79fedf4b232d533fb

TDLS: Pass peer's VHT Capability information during sta_add
WPS: Clear sent_carrier to avoid errors in python script
WPS: Fix OOB Device Password use in PSK1,PSK1 derivation
WPS: Add AP mode NFC connection handover with wpa_supplicant/nfcpy
WPS NFC: Add connection handover support for ER
WPS: Add wps-er-config command for writing config token from ER

Change-Id: I8934dcffb9f66bd3a2f840b78d72c9dd6cecf61d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>