tree a0d4d58bb7fd20dc3a678bf5e4bec4d31982b11a
parent 0d16a24facb038db649f4baeb6e6709880adfd98
parent f7f24ff14fa691903849942444025175f627e873
author Jouni Malinen <jouni@qca.qualcomm.com> 1374274105 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374274105 -0700

am f7f24ff1: (-s ours) am 74d2224e: Do not add BSS to blacklist on local disconnection request, DO NOT MERGE

* commit 'f7f24ff14fa691903849942444025175f627e873':
  Do not add BSS to blacklist on local disconnection request, DO NOT MERGE