aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Cumulative patch from commit 20ff2642e192437245422c9654463bcebf65b277Dmitry Shmidt2014-03-219-126/+158
* Cumulative patch from commit f4e3860f8a770a0db3816196c77baf894c7ccc1eDmitry Shmidt2014-03-1745-326/+683
* Cumulative patch from commit 39b420f7b12b152f879d1bb8a5267b9a838e04dcDmitry Shmidt2014-03-1224-1312/+11516
* Cumulative patch from commit 99cd77a8c50413d44f1ebead917310468a8406deDmitry Shmidt2014-03-1129-229/+357
* Cumulative patch from commit 390b92913a9a1b3a6aaf70e8b5971a7b7c76cabcDmitry Shmidt2014-03-1036-445/+1148
* Cumulative patch from commit c16a7590cfe76d5895ac70ef711e5b0b384f7aa6Dmitry Shmidt2014-03-079-4/+76
* Cumulative patch from commit 905828fea4b95a6d48ce86e1b5272c25a618b3d8Dmitry Shmidt2014-03-0628-97/+398
* Cumulative patch from commit 5f7e1c06cd428888a2ed4fa763c5da37a873e422Dmitry Shmidt2014-03-0328-144/+188
* Cumulative patch from commit 06c7b7f0b5f4deed675a7b81e33830311da7339aDmitry Shmidt2014-02-288-22/+45
* Cumulative patch from commit 5e32f8256f5fcce8b70a95e070375ac549ac935aDmitry Shmidt2014-02-2694-202/+4511
* am 79a3a004: (-s ours) am d28183c0: Merge "Android: Use external libnl 2.0 dy...Dmitry Shmidt2014-02-250-0/+0
|\
| * am d28183c0: Merge "Android: Use external libnl 2.0 dynamic library"Dmitry Shmidt2014-02-252-4/+4
| |\
| | * Merge "Android: Use external libnl 2.0 dynamic library"Dmitry Shmidt2014-02-252-4/+4
| | |\
| | | * Android: Use external libnl 2.0 dynamic libraryDmitry Shmidt2014-02-242-4/+4
| | |/
* | | Cumulative patch from commit aef5047acc971c97622c85236f0cd84d169221e6Dmitry Shmidt2014-02-2110-2/+415
* | | Android: Remove explicit SSL_OP_NO_TLSv1_1 and SSL_OP_NO_TLSv1_2Dmitry Shmidt2014-02-201-5/+0
* | | Cumulative patch from commit 848905b12abf2df650c43cb821d36a13246baacbDmitry Shmidt2014-02-2015-44/+222
* | | Android: Remove obsolete ANDROID_P2P from p2p_sd_requestDmitry Shmidt2014-02-201-13/+0
* | | Cumulative patch from commit ac494fcce4270dbd076ab1d167dbffd6e0f7060bDmitry Shmidt2014-02-196-17/+19
* | | Android: Make libnl 2.0 support build-agnosticDmitry Shmidt2014-02-182-0/+16
* | | Android: Use external libnl 2.0 dynamic libraryDmitry Shmidt2014-02-182-4/+4
* | | Cumulative patch from commit b3253ebb73d6d52ac636c5cc6d958955a5a98fcaDmitry Shmidt2014-02-1836-160/+432
* | | Cumulative patch from commit 7ae7a84eefd43ed9385e2f8f520a918468f87178Dmitry Shmidt2014-02-1325-145/+653
* | | wpa_supplicant: Add DFS indicator to get_capability freqDmitry Shmidt2014-02-061-2/+5
* | | Cumulative patch from commit bab6677a3105f15b19b6be4a189e7baf61b4f791Dmitry Shmidt2014-02-064-5/+20
* | | Cumulative patch from commit a05e236b11bfb4dacfc269938181104a6303247cDmitry Shmidt2014-02-0416-158/+164
* | | Cumulative patch from commit 1b56d398a7646c66fd3df8f0a5159c920f99de36Dmitry Shmidt2014-02-0313-70/+155
* | | Cumulative patch from commit 2e988392436227c51002b573ee27a8cee37f70e9Dmitry Shmidt2014-01-2866-618/+4029
* | | Cumulative patch from commit 8615bdfac90174c3730ae5e6607b85f8bbec847eDmitry Shmidt2014-01-2426-51/+496
* | | P2P: Reduce peer expiration age to 60 sec and allow customizationDmitry Shmidt2014-01-171-1/+3
* | | Cumulative patch from commit 3eaaca1a0b372f31ddc43d152c3681dce48889bbDmitry Shmidt2014-01-176-52/+44
* | | Android: Enable 802.11v (WNM) support in wpa_supplicantDmitry Shmidt2014-01-152-1/+3
* | | Android: Enable 802.11r (Fast BSS transition) support in wpa_supplicantDmitry Shmidt2014-01-151-1/+1
* | | Android: Revert 100 ms wait before starting persistent groupDmitry Shmidt2014-01-151-6/+0
* | | Android: Revert p2p->min_disc_int = 2 changeDmitry Shmidt2014-01-151-7/+0
* | | Android: Enable 802.11w (PMF) support in wpa_supplicantDmitry Shmidt2014-01-142-2/+2
* | | Cumulative patch from commit efc64886b8a285440e9954b5395a5370d8c5f84fDmitry Shmidt2014-01-1434-119/+400
* | | Android: Remove sd listsDmitry Shmidt2014-01-143-81/+0
* | | Cumulative patch from commit 95fb2db2420d8fa291fd6423cc6dbcd042f4eb46Dmitry Shmidt2014-01-14165-4469/+4682
* | | Cumulative patch from commit commit 8fcabc681760a390dc9ce16de57162e52e39058bDmitry Shmidt2013-12-182-0/+3
* | | Cumulative patch from commit 075131e32e6967977da4bbfa8a7f63dbfbf86008iDmitry Shmidt2013-12-0929-151/+489
* | | Merge "Revert "Android: Handle Freq conflict in single channel concurrency ca...Dmitry Shmidt2013-12-064-111/+1
|\ \ \
| * | | Revert "Android: Handle Freq conflict in single channel concurrency case"Dmitry Shmidt2013-12-054-111/+1
* | | | Merge "Cumulative patch from commit 0ad3b9c402ee92863b720bc01f882ebcb1bd42c8"Dmitry Shmidt2013-12-0632-159/+448
|\| | |
| * | | Cumulative patch from commit 0ad3b9c402ee92863b720bc01f882ebcb1bd42c8Dmitry Shmidt2013-12-0532-159/+448
* | | | am 42e54fa6: am dd9a784a: Merge commit \'f62167e88c0c1b9621f2984f1a59ae7d41cf...The Android Open Source Project2013-12-060-0/+0
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | am dd9a784a: Merge commit \'f62167e88c0c1b9621f2984f1a59ae7d41cf4c88\' into HEADThe Android Open Source Project2013-12-050-0/+0
| |\|
| | * Merge commit 'f62167e88c0c1b9621f2984f1a59ae7d41cf4c88' into HEADThe Android Open Source Project2013-12-055-2/+34
| | |\
* | | | am 2db4db04: am 243e04f8: Merge "Treat VER_2_1_DEVEL the same as VER_0_8_X"Ying Wang2013-12-050-0/+0
|\| | |
| * | | am 243e04f8: Merge "Treat VER_2_1_DEVEL the same as VER_0_8_X"Ying Wang2013-12-051-7/+1
| |\| | | | |/ | |/|