tree 6ecf6208dd9caf0ad1aee361e7de44d71b80f3d6
parent de8f11654f10cf9e7d6285a26680dda3ac757b5e
parent c05cb5ffb33ad59236cad29c920aea0a70c1178f
author Vinit Deshpande <vinitd@google.com> 1401465661 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401465661 +0000

am e56124b3: (-s ours) Merge "DO NOT MERGE: Revert "Make Wifi WPS API available on application layer"" into lmp-preview-dev

* commit 'e56124b39fcb952a9866d68a84f050bf63cc2140':
  DO NOT MERGE: Revert "Make Wifi WPS API available on application layer"