1. 6292bd7 am 7bf0939e: am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 13 years ago
  2. 7bf0939 am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 13 years ago
  3. 7298e5a am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 13 years ago
  4. 2f3c163 am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 13 years ago
  5. 89d125e Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 13 years ago
  6. be6cd8f Merge "wpa_supplicant_8: use correct header file." by Nick Kralevich · 13 years ago
  7. a562b19 wpa_supplicant_8: use correct header file. by Nick Kralevich · 13 years ago
  8. 45fcd5c am f137c56d: Merge "Fix INCLUDES path for keystore headers." by Kenny Root · 13 years ago
  9. f137c56 Merge "Fix INCLUDES path for keystore headers." by Kenny Root · 13 years ago
  10. cd4bf96 am a18eec54: Merge "Fix regression in LEAP" by Jean-Baptiste Queru · 13 years ago
  11. a18eec5 Merge "Fix regression in LEAP" by Jean-Baptiste Queru · 13 years ago
  12. 259809b Fix regression in LEAP by Jouni Malinen · 13 years ago
  13. 0fb7340 am 0cc49e8d: Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support by Mike J. Chen · 13 years ago
  14. 0cc49e8 Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support by Mike J. Chen · 13 years ago
  15. d350192 Merge "Include the subdir Android.mks in fixed order." by Ying Wang · 13 years ago
  16. b5ec21c Include the subdir Android.mks in fixed order. by Ying Wang · 13 years ago
  17. f1396b4 Fix INCLUDES path for keystore headers. by Stephen Smalley · 13 years ago
  18. 56388db Merge "Switch keystore to binder" by Kenny Root · 13 years ago
  19. 3f3ca3b Switch keystore to binder by Kenny Root · 13 years ago
  20. 600a727 am c0aec062: am 930540de: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge by The Android Open Source Project · 13 years ago
  21. c0aec06 am 930540de: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge by The Android Open Source Project · 13 years ago
  22. 930540d Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge by The Android Open Source Project · 13 years ago
  23. 19409cd Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 13 years ago
  24. 279731e merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 13 years ago
  25. 5d7d6ac am efb9743f: am 86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev by Irfan Sheriff · 13 years ago
  26. efb9743 am 86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev by Irfan Sheriff · 13 years ago
  27. 86c93df Merge "Increase timeouts for p2p" into jb-mr1-dev by Irfan Sheriff · 13 years ago
  28. af40b4e Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge by The Android Open Source Project · 13 years ago
  29. 1a2ce11 Increase timeouts for p2p by Irfan Sheriff · 13 years ago
  30. 31322d3 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 13 years ago
  31. f368213 am a27072d9: am b8fdecbf: Add parameter checking and error reporting to wpa_blacklist API. by Sasha Levitskiy · 13 years ago
  32. a27072d am b8fdecbf: Add parameter checking and error reporting to wpa_blacklist API. by Sasha Levitskiy · 13 years ago
  33. b8fdecb Add parameter checking and error reporting to wpa_blacklist API. by Sasha Levitskiy · 13 years ago
  34. f210a2f am d73deeec: am 54cb0f6f: wpa_supplicant: Try to reject proper BSSID even if not set by the driver by Dmitry Shmidt · 13 years ago
  35. d73deee am 54cb0f6f: wpa_supplicant: Try to reject proper BSSID even if not set by the driver by Dmitry Shmidt · 13 years ago
  36. 54cb0f6 wpa_supplicant: Try to reject proper BSSID even if not set by the driver by Dmitry Shmidt · 13 years ago
  37. 1158d27 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 13 years ago
  38. dc4a9a1 am 03df168d: am b485b188: Add better handling of CTRL-EVENT-ASSOC-REJECT by Jeff Johnson · 13 years ago
  39. 03df168 am b485b188: Add better handling of CTRL-EVENT-ASSOC-REJECT by Jeff Johnson · 13 years ago
  40. b485b18 Add better handling of CTRL-EVENT-ASSOC-REJECT by Jeff Johnson · 13 years ago
  41. ed9aced merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 13 years ago
  42. c933005 am a44422be: am 12b1cd9e: Support conc_pref when use_p2p_group_interface=0 by Jeff Johnson · 13 years ago
  43. a44422b am 12b1cd9e: Support conc_pref when use_p2p_group_interface=0 by Jeff Johnson · 13 years ago
  44. 12b1cd9 Support conc_pref when use_p2p_group_interface=0 by Jeff Johnson · 13 years ago
  45. 6e33bb9 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 13 years ago
  46. 1449e2b am f1b71881: am 81931b8b: Increase channel delay to 100ms by Irfan Sheriff · 13 years ago
  47. f1b7188 am 81931b8b: Increase channel delay to 100ms by Irfan Sheriff · 13 years ago
  48. 81931b8 Increase channel delay to 100ms by Irfan Sheriff · 13 years ago
  49. 6de35d8 merge in jb-mr1-factory-release history after reset to jb-mr1-dev by The Android Automerger · 13 years ago
  50. d5d5927 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 13 years ago
  51. ad78b33 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 13 years ago
  52. 6c59bc1 am 532a21e6: am 2c5b17df: P2P: Improve robustness against lost ctrl::ack by Jouni Malinen · 13 years ago
  53. 532a21e am 2c5b17df: P2P: Improve robustness against lost ctrl::ack by Jouni Malinen · 13 years ago
  54. 2c5b17d P2P: Improve robustness against lost ctrl::ack by Jouni Malinen · 13 years ago
  55. 65c8df8 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 13 years ago
  56. 1cccfe8 P2P: Fix network removal to select correct block by Jouni Malinen · 13 years ago
  57. 7c5e12a am fe62849f: am 9d712833: P2P: Fix network removal to select correct block by Jouni Malinen · 13 years ago
  58. fe62849 am 9d712833: P2P: Fix network removal to select correct block by Jouni Malinen · 13 years ago
  59. 9d71283 P2P: Fix network removal to select correct block by Jouni Malinen · 13 years ago
  60. 86b5c67 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 13 years ago
  61. ba39653 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 13 years ago
  62. 235dc89 am 436d1e84: am adddfc48: P2P: Fix p2p_cancel processing during group formation by Jouni Malinen · 13 years ago
  63. 436d1e8 am adddfc48: P2P: Fix p2p_cancel processing during group formation by Jouni Malinen · 13 years ago
  64. adddfc4 P2P: Fix p2p_cancel processing during group formation by Jouni Malinen · 13 years ago
  65. 4177ffd am 992b10f4: (-s ours) Reconcile with jb-dev - do not merge by Jean-Baptiste Queru · 13 years ago
  66. 992b10f Reconcile with jb-dev - do not merge by Jean-Baptiste Queru · 13 years ago
  67. e2ca21c Merge from jb-mr1-aah-dev by Jean-Baptiste Queru · 13 years ago
  68. 31dab59 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 13 years ago
  69. cf24ade merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 13 years ago
  70. 5fd5a96 am 069fa2c3: Remove unnecessary channel list filtering by Irfan Sheriff · 13 years ago
  71. d539347 am 069fa2c3: Remove unnecessary channel list filtering by Irfan Sheriff · 13 years ago
  72. ff81427 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 13 years ago
  73. 9662bcd merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 13 years ago
  74. 069fa2c Remove unnecessary channel list filtering by Irfan Sheriff · 13 years ago
  75. 82e047b am 91c40cdc: wpa_supplicant: P2P-related fixes by Dmitry Shmidt · 13 years ago
  76. 2d52248 am 91c40cdc: wpa_supplicant: P2P-related fixes by Dmitry Shmidt · 13 years ago
  77. 91c40cd wpa_supplicant: P2P-related fixes by Dmitry Shmidt · 13 years ago
  78. 2b1bd2a merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 13 years ago
  79. 1bc49db am aa532510: wpa_supplicant: P2P-related fixes by Dmitry Shmidt · 13 years ago
  80. 03b9cf8 am aa532510: wpa_supplicant: P2P-related fixes by Dmitry Shmidt · 13 years ago
  81. aa53251 wpa_supplicant: P2P-related fixes by Dmitry Shmidt · 13 years ago
  82. e6ce589 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 13 years ago
  83. a1b911d am f0619665: Fix build: Add ANDROID_P2P for SCC interop fixes by Irfan Sheriff · 13 years ago
  84. 3618cfa am af84a575: GC channel fixes for better interop with SCC by Irfan Sheriff · 13 years ago
  85. d0c58c3 am f0619665: Fix build: Add ANDROID_P2P for SCC interop fixes by Irfan Sheriff · 13 years ago
  86. a9ebfe2 am af84a575: GC channel fixes for better interop with SCC by Irfan Sheriff · 13 years ago
  87. 8662198 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 13 years ago
  88. f061966 Fix build: Add ANDROID_P2P for SCC interop fixes by Irfan Sheriff · 13 years ago
  89. 60d855c merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 13 years ago
  90. af84a57 GC channel fixes for better interop with SCC by Irfan Sheriff · 13 years ago
  91. 1389bc2 Reconcile with jb-mr1-release - do not merge by The Android Open Source Project · 13 years ago
  92. 2b00140 merge in jb-mr1-release history after reset to jb-mr1-dev by The Android Automerger · 13 years ago
  93. 49ff4f9 am 89ca702e: Do not inform other virtual interfaces of scan results in all cases by Jouni Malinen · 13 years ago
  94. daffc16 am 89ca702e: Do not inform other virtual interfaces of scan results in all cases by Jouni Malinen · 13 years ago
  95. f9edc42 am fa08f9eb: P2P: Schedule new scan if P2P operation delays scan by Jouni Malinen · 13 years ago
  96. 0f9a57d am 043a5a9d: P2P: Check all interfaces for pending scan for p2p_scan failures by Jouni Malinen · 13 years ago
  97. 1efe18a am dc7b7132: P2P: Move p2p_cb_on_scan_complete to global context by Jouni Malinen · 13 years ago
  98. b6dcd87 am fa08f9eb: P2P: Schedule new scan if P2P operation delays scan by Jouni Malinen · 13 years ago
  99. c9f2a64 am 043a5a9d: P2P: Check all interfaces for pending scan for p2p_scan failures by Jouni Malinen · 13 years ago
  100. a9df23e am dc7b7132: P2P: Move p2p_cb_on_scan_complete to global context by Jouni Malinen · 13 years ago