OSDN Git Service

Merge "Call bta_dm_sp_cback if BTM_LOCAL_IO_CAPS == BTM_IO_CAP_NONE" am: 9d098408ce...
authorBailey Forrest <bcf@google.com>
Mon, 7 Aug 2017 23:03:45 +0000 (23:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 7 Aug 2017 23:03:45 +0000 (23:03 +0000)
commit77ccff6d94c60674eb87b621afabc38aad5906cf
treedb3f95854dd8ae10cbbaccb43af224f5aa8daa3f
parent86cc6e958705622ad7e6867362272a687a8ba132
parentad3e4d8347bcc0edfdfa9b935107d42457914199
Merge "Call bta_dm_sp_cback if BTM_LOCAL_IO_CAPS == BTM_IO_CAP_NONE" am: 9d098408ce am: 4a09400364
am: ad3e4d8347

Change-Id: Id67303ca15e4f0e7649682c08fd54f34871f532c