diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-07-19 16:02:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-19 16:02:27 -0700 |
| commit | a1c1be9e75d20e064c9ffbd1d2f51257881c369b (patch) | |
| tree | a0d4d58bb7fd20dc3a678bf5e4bec4d31982b11a /src/p2p/p2p.h | |
| parent | eec38ff40c4d190d3e0155c790dbb419962ef6e0 (diff) | |
| parent | 184937322b767748f4d65758616cc9db2d670564 (diff) | |
| download | android_external_wpa_supplicant_8-a1c1be9e75d20e064c9ffbd1d2f51257881c369b.tar.gz android_external_wpa_supplicant_8-a1c1be9e75d20e064c9ffbd1d2f51257881c369b.tar.bz2 android_external_wpa_supplicant_8-a1c1be9e75d20e064c9ffbd1d2f51257881c369b.zip | |
am 18493732: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '184937322b767748f4d65758616cc9db2d670564':
Mark interface disconnected on removal request, DO NOT MERGE
Do not try auto connect mechanism in disconnected state, DO NOT MERGE
Do not add BSS to blacklist on local disconnection request, DO NOT MERGE
Diffstat (limited to 'src/p2p/p2p.h')
0 files changed, 0 insertions, 0 deletions