1. 902f82c [automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 9299b79eba -s ours am: 93b87295f3 -s ours by Myles Watson · 6 years ago
  2. a46a18f [automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr am: 9299b79eba -s ours by Myles Watson · 6 years ago
  3. 93b8729 [automerger skipped] DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr by Myles Watson · 6 years ago
  4. 9299b79 DO NOT MERGE: SDP: Check p_end in save_attr_seq and add_attr by Myles Watson · 7 years ago
  5. 295302a [automerger skipped] resolve merge conflicts of 10edcaf6f30ebff2447c124712a0bd5a93805ab5 to oc-dr1-dev am: f1d23b5b71 -s ours am: c7476c3425 -s ours by Ugo Yu · 6 years ago
  6. 879b385 [automerger skipped] resolve merge conflicts of 10edcaf6f30ebff2447c124712a0bd5a93805ab5 to oc-dr1-dev am: f1d23b5b71 -s ours by Ugo Yu · 6 years ago
  7. c7476c3 [automerger skipped] resolve merge conflicts of 10edcaf6f30ebff2447c124712a0bd5a93805ab5 to oc-dr1-dev by Ugo Yu · 6 years ago
  8. f1d23b5 resolve merge conflicts of 10edcaf6f30ebff2447c124712a0bd5a93805ab5 to oc-dr1-dev by Ugo Yu · 6 years ago
  9. 5ffd2f6 Merge "Store BLE keys using the address from the ble_auth_cmpl_evt" into qt-dev by TreeHugger Robot · 6 years ago
  10. 0f85098 [automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt am: 9f78214f72 -s ours by Ugo Yu · 6 years ago
  11. c9f32dd [automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt by Ugo Yu · 6 years ago
  12. 41e934d [automerger skipped] DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt by Ugo Yu · 6 years ago
  13. 8417a5c Store BLE keys using the address from the ble_auth_cmpl_evt by Ugo Yu · 6 years ago
  14. 10edcaf DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt by Ugo Yu · 6 years ago
  15. 9f78214 DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt by Ugo Yu · 6 years ago
  16. 8f2f9ff DO NOT MERGE Store BLE keys using the address from the ble_auth_cmpl_evt by Ugo Yu · 6 years ago
  17. 68eec05 Switch Nintendo workaround to match by name by Andre Eisenbach · 6 years ago
  18. 7839f00 Match Nintento Pro Controller by name for interop by Andre Eisenbach · 6 years ago
  19. 8d609d5 RootCanal: Set the timer period to 1 second by Myles Watson · 6 years ago
  20. 2def54a Merge "RootCanal: Make beacons less verbose" into qt-dev by TreeHugger Robot · 6 years ago
  21. 5cb9a13 RootCanal: Make beacons less verbose by Myles Watson · 6 years ago
  22. d15b5ed DO NOT MERGE RootCanal: Always add default devices by Myles Watson · 6 years ago
  23. a6c085e Revert "libprocessgroup users use libcutils" by Zhijun He · 6 years ago
  24. f425b66 Limit sniff mode for Nintendo Pro Controller to 11.25ms by Andre Eisenbach · 6 years ago
  25. 43902e3 Merge "Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"" into qt-dev by TreeHugger Robot · 6 years ago
  26. 433db92 Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" by Martin Brabham · 6 years ago
  27. 6e4cc42 libprocessgroup users use libcutils by Steven Moreland · 6 years ago
  28. b9492b5 Fix for BluetoothGattCallback.onConnectionStateChange being called more than once by Jakub Pawlowski · 6 years ago
  29. 67d83ba Load gatt_database if it is empty in bta_gattc_process_indicate by weichinweng · 6 years ago
  30. 6e846e7 Revert "Open connection if it doesn't exsist in bta_gattc_process_indicate" by Jakub Pawlowski · 6 years ago
  31. 6fb3d95 Confirm the presence of BT key when BT ON by Martin Brabham · 6 years ago
  32. 28f74d5 [automerger skipped] Merge changes from topic "am-e3f94184-0df3-403b-b2dc-4ebd50beee32" into oc-dev am: abfc112903 -s ours am: ba6e990107 -s ours am: f5855d84b1 -s ours by Jakub Pawlowski · 6 years ago
  33. 17c8c7b [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 0cf7f2c909 -s ours am: c1d4129402 -s ours am: 812cf3fc64 -s ours by Jakub Pawlowski · 6 years ago
  34. 398e0e6 [automerger skipped] Merge changes from topic "am-e3f94184-0df3-403b-b2dc-4ebd50beee32" into oc-dev am: abfc112903 -s ours am: ba6e990107 -s ours by Jakub Pawlowski · 6 years ago
  35. 6805675 [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 0cf7f2c909 -s ours am: c1d4129402 -s ours by Jakub Pawlowski · 6 years ago
  36. f5855d8 [automerger skipped] Merge changes from topic "am-e3f94184-0df3-403b-b2dc-4ebd50beee32" into oc-dev am: abfc112903 -s ours by Jakub Pawlowski · 6 years ago
  37. 812cf3f [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 0cf7f2c909 -s ours by Jakub Pawlowski · 6 years ago
  38. ba6e990 [automerger skipped] Merge changes from topic "am-e3f94184-0df3-403b-b2dc-4ebd50beee32" into oc-dev by Jakub Pawlowski · 6 years ago
  39. c1d4129 [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size by Jakub Pawlowski · 6 years ago
  40. abfc112 Merge changes from topic "am-e3f94184-0df3-403b-b2dc-4ebd50beee32" into oc-dev by Jakub Pawlowski · 6 years ago
  41. f307570 [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 4b9fcd9917 -s ours by Jakub Pawlowski · 6 years ago
  42. f041374 [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size by Jakub Pawlowski · 6 years ago
  43. 1c0d7f0 [automerger skipped] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size by Jakub Pawlowski · 6 years ago
  44. c0affbc [automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 5ddb1de24d am: 03bf5b8257 am: 8377c6ba97 am: 2623bcc3b1 skipped: c5e7580ccb by Android Build Merger (Role) · 6 years ago
  45. c5e7580 [automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 5ddb1de24d am: 03bf5b8257 am: 8377c6ba97 am: 2623bcc3b1 by Android Build Merger (Role) · 6 years ago
  46. 2623bcc [automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 5ddb1de24d am: 03bf5b8257 am: 8377c6ba97 by Android Build Merger (Role) · 6 years ago
  47. 8377c6b [automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 5ddb1de24d am: 03bf5b8257 by Android Build Merger (Role) · 6 years ago
  48. 03bf5b8 [automerger] DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size am: 5ddb1de24d by Android Build Merger (Role) · 6 years ago
  49. 5ddb1de DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size by Jakub Pawlowski · 6 years ago
  50. 0cf7f2c DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size by Jakub Pawlowski · 6 years ago
  51. 4b9fcd9 DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size by Jakub Pawlowski · 6 years ago
  52. 0b95103 DO NOT MERGE Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size by Jakub Pawlowski · 6 years ago
  53. 41c9f04 Fix for Bluetooth connection being dropped after HCI Read Encryption Key Size by Jakub Pawlowski · 6 years ago
  54. a05a498 Rename and reset the proirity of HID host thread by Ugo Yu · 6 years ago
  55. cb0de39 [automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am: 519c53381b am: 0052770ee3 -s ours am: 111aca0a94 -s ours by Ugo Yu · 6 years ago
  56. fa6be4f [automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: b5268c5b7f am: 286cfd69d9 -s ours am: b6e5306304 -s ours by Ugo Yu · 6 years ago
  57. 80e83cb [automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am: 519c53381b am: 0052770ee3 -s ours by Ugo Yu · 6 years ago
  58. c77fe25 [automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: b5268c5b7f am: 286cfd69d9 -s ours by Ugo Yu · 6 years ago
  59. dc31839 Merge "Hearing Aid: properly track audio Suspend/Resume" into qt-dev by TreeHugger Robot · 6 years ago
  60. 111aca0 [automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev am: 519c53381b by Ugo Yu · 6 years ago
  61. b6e5306 [automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: b5268c5b7f by Ugo Yu · 6 years ago
  62. 0052770 Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev by Ugo Yu · 6 years ago
  63. 286cfd6 DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: b5268c5b7f by Ugo Yu · 6 years ago
  64. 519c533 Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-dev by TreeHugger Robot · 6 years ago
  65. e8ac70e Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev am: 0f2e2d8266 am: 671587c3db am: a18404d39f by Ugo Yu · 6 years ago
  66. 78b42e3 [automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee9b am: 1252468253 am: dd272f550e am: 0a820c2c0d skipped: 8dc614930c am: cd5e720afb am: 9ba77d4bf9 am: d103768028 -s ours by Ugo Yu · 6 years ago
  67. 02c17f2 Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev am: 0f2e2d8266 am: 671587c3db by Ugo Yu · 6 years ago
  68. 9c4d027 [automerger skipped] [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee9b am: 1252468253 am: dd272f550e am: 0a820c2c0d skipped: 8dc614930c am: cd5e720afb am: 9ba77d4bf9 by Ugo Yu · 6 years ago
  69. b5268c5 DO NOT MERGE Separate SDP procedure from bonding state (1/2) by Ugo Yu · 6 years ago
  70. a18404d Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev am: 0f2e2d8266 by Ugo Yu · 6 years ago
  71. d103768 [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee9b am: 1252468253 am: dd272f550e am: 0a820c2c0d skipped: 8dc614930c am: cd5e720afb by Ugo Yu · 6 years ago
  72. 0743db5 [automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev am: 0ecc542d16 -s ours by Ugo Yu · 6 years ago
  73. 1d27054 [automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: add688f6b3 -s ours by Ugo Yu · 6 years ago
  74. 57110dd [automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev by Ugo Yu · 6 years ago
  75. 671587c Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev by Ugo Yu · 6 years ago
  76. 9ba77d4 [automerger] DO NOT MERGE Separate SDP procedure from bonding state (1/2) am: 08fca7ee9b am: 1252468253 am: dd272f550e am: 0a820c2c0d skipped: 8dc614930c by Ugo Yu · 6 years ago
  77. 967fe01 Hearing Aid: properly track audio Suspend/Resume by Jakub Pawlowski · 6 years ago
  78. 31815b8 [automerger skipped] Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev by Ugo Yu · 6 years ago
  79. fe6f43d [automerger skipped] DO NOT MERGE Separate SDP procedure from bonding state (1/2) by Ugo Yu · 6 years ago
  80. 0ecc542 Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into oc-mr1-dev by TreeHugger Robot · 6 years ago
  81. 970a11a Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into pi-dev by TreeHugger Robot · 6 years ago
  82. dcb4802 Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into nyc-mr2-dev by TreeHugger Robot · 6 years ago
  83. 5c0f18c Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into cw-f-dev by TreeHugger Robot · 6 years ago
  84. 5a43c54 Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into nyc-mr1-dev by TreeHugger Robot · 6 years ago
  85. af3e16a Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into nyc-dr1-dev by TreeHugger Robot · 6 years ago
  86. cf58e33 Merge "DO NOT MERGE Separate SDP procedure from bonding state (1/2)" into nyc-dev by TreeHugger Robot · 6 years ago
  87. 0f2e2d8 Merge changes from topic "am-d2784a9e-cd2f-4414-b4db-f53b523a7b87" into oc-dev by TreeHugger Robot · 6 years ago
  88. 57c858a [automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev am: 357a36f35d am: b3bdb9e341 am: 7db943f62f -s ours by Martin Brabham · 6 years ago
  89. 4080475 [automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 9cd13ebccb am: d7f9b19381 am: 6c20cafad8 -s ours by Martin Brabham · 6 years ago
  90. 5b2a1e6 [automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev am: 357a36f35d am: b3bdb9e341 by Martin Brabham · 6 years ago
  91. e57a775 [automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 9cd13ebccb am: d7f9b19381 by Martin Brabham · 6 years ago
  92. 7db943f Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev am: 357a36f35d by Martin Brabham · 6 years ago
  93. 6c20caf DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 9cd13ebccb by Martin Brabham · 6 years ago
  94. f68060c [automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into pi-dev by Martin Brabham · 6 years ago
  95. b3bdb9e Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev by Martin Brabham · 6 years ago
  96. d7f9b19 DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 9cd13ebccb by Martin Brabham · 6 years ago
  97. 706a7f4 Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into pi-dev by TreeHugger Robot · 6 years ago
  98. 357a36f Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev by TreeHugger Robot · 6 years ago
  99. 37c3916 Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f" into oc-dev am: 033bd56ce9 am: e592826141 am: 63af3c86c5 by Martin Brabham · 6 years ago
  100. c4dda88 [automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP skipped: 8b2e81a722 am: 008c7ff7ea am: 0743275088 am: f5588536c3 -s ours by Martin Brabham · 6 years ago