am 05725beb: am 963ce475: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev

* commit '05725beb3565d1eecc3c59995f3c3642d85b5556':
This commit is contained in:
Vinit Deshpande
2014-09-15 23:55:00 +00:00
committed by Android Git Automerger

Diff Content Not Available