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

Commit 6d783d0d authored by Etienne Ruffieux's avatar Etienne Ruffieux Committed by Automerger Merge Worker
Browse files

Merge "Handle conflicts in avct browse" into main am: c9e68ce5 

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



Change-Id: I7fc9ed05cc7632d5b965164b4a4a936d1097d81a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 586516a1 c9e68ce5
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