Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baf52cef authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

Merge "[Invisalign2] remove undefined p_encrypt_cback in tBTA_DM_CB" into main... 

Merge "[Invisalign2] remove undefined p_encrypt_cback in tBTA_DM_CB" into main am: a0316f9e am: 8d1fa366 am: 0dedbbe8 am: 087c6742

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2787474



Change-Id: Icbe0b65d875d8c19c9127ac11b64335cbda2c91d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 95a4b05b 087c6742
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment