tree 7682277298907b785c01866abfd3396b0d56dac0
parent bcd20f850c1540ff6b5b88b46acea4a67354da99
parent 73f5d16ad5c61320deac161fe23e00a8a4aed772
author Vinit Deshpande <vinitd@google.com> 1409705967 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1409705968 +0000

Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev