OSDN Git Service

resolve merge conflicts of c4a376463ad3ef2df25f57624edbd5ec4e90d48c to rvc-qpr-dev...
authorMyles Watson <mylesgw@google.com>
Thu, 4 Mar 2021 01:40:01 +0000 (01:40 +0000)
committerMyles Watson <mylesgw@google.com>
Thu, 4 Mar 2021 01:41:44 +0000 (01:41 +0000)
commitefa80f56908beae299654c0a67567c47baa47e02
treebdcc99319bf082d07a035505252042135c561ed7
parentb891eab6efa527227397e7cb173e4b7f159f4969
parentc4a376463ad3ef2df25f57624edbd5ec4e90d48c
resolve merge conflicts of c4a376463ad3ef2df25f57624edbd5ec4e90d48c to rvc-qpr-dev-plus-aosp

Change-Id: I0df2ad9ed138414bfc4551ec175e086cf7c112a7
btif/src/btif_sock_l2cap.cc