tree de52739eef3309a57db6782c16fa470769c3dd98
parent d11f019d62a42a8fc4c4d1f2ec17cf35b0763153
author Dmitry Shmidt <dimitrysh@google.com> 1395769377 -0700
committer Dmitry Shmidt <dimitrysh@google.com> 1395769377 -0700

Cumulative patch from commit cf28c66bcb8883e6be921d6406a534e4a5b45b96

cf28c66 HS 2.0: Extend ANQP_GET to accept Hotspot 2.0 subtypes
163f801 nl80211: Indicate HS 2.0 OSEN AKM in connect/associate command
c201f93 WPS: Enable WSC 2.0 support unconditionally
91364b7 P2P: Set a timeout for a persistent reinvoke on a P2P Client
41d5ce9 P2P: Optimize scan for GO during persistent group invocation
4d1e38b ACS: Fix number of error path issues

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