OSDN Git Service

Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
authorXin Li <delphij@google.com>
Wed, 2 Dec 2020 08:22:22 +0000 (00:22 -0800)
committerXin Li <delphij@google.com>
Wed, 2 Dec 2020 08:22:22 +0000 (00:22 -0800)
commit5eaf1b5764c76fec4440fba3fa7b357122139ced
tree35ad610680ce9882d0727538e4794de88d38916e
parent29535fc1ec4c122bd47be122e4c3933a42790eb4
parent876568dee78d7ca75486b83fe8d504b2faea56c2
Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855

Bug: 172690556
Merged-In: I3df16624bc34baff60de7f02e555551482519385
Change-Id: I055e02bf7b5b21ad6bd91f4d73ca4501e833a892
stack/Android.bp
stack/btm/btm_sec.cc
stack/smp/smp_api.cc