2 Commits

Author	SHA1	Message	Date
Andrew Flynn	222a093649	resolved conflicts for merge of f89dc7c9 to master ... Change-Id: Icd37261dd3ce920b3bed359ed5232bdc018916fc	2012-05-22 14:15:20 -07:00
Irfan Sheriff	90380120e7	Enhance and fix WPS UI ... - Fixes WPS usage for open network - Exposes WPS on UI for easy access to push button and pin based techniques - Adds support for cancelling WPS - Adds a dialog that reports a progress since WPS can take quite a bit of time to complete The WpsDialog code is enhanced from contribution by yoshihiko.ikenaga@jp.sony.com on partner source. Change-Id: Ib0103507e0192e8195e7bfeb1c8e8855c20e23ca	2012-03-02 14:25:00 -08:00