| commit | 6990092f7c3091b2e876e923c33848bca761af83 | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Mon Nov 18 20:05:36 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 18 20:05:37 2013 +0000 |
| tree | cf6f77d8649b6633ad2dcb88662ffaf4514995e9 | |
| parent | 3f3d6a59b3e3d1aaaa2176db065a4f1a88ad7c70 [diff] | |
| parent | 7e6eef4d7cae2a3f6b49744844c20cce3dc2ef28 [diff] |
Merge changes I01c09b4d,I0a524cdb,I378fcfc4 * changes: Android: Remove changing oper_freq in p2p_process_go_neg_conf() Revert setting wpa_s->conf->ap_scan = DEFAULT_AP_SCAN Revert "Allow immediate scan request even if another scan was scheduled later"