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

Skip to content
Commit 6f6a5589 authored by Henri Chataing's avatar Henri Chataing Committed by Automerger Merge Worker
Browse files

[automerger skipped] system/bta/jv: Conflict resolution for libbluetooth_log... 

[automerger skipped] system/bta/jv: Conflict resolution for libbluetooth_log migration am: a97ce1db -s ours

am skip reason: Merged-In Ic6401ddfd1ea18d6f846bb8719ca798d2ef9bbf4 with SHA-1 3cc60340 is already in history

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



Change-Id: I14a354ec93337ea3b69fdbb1f4a9a16353b2b90b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3bc36bda a97ce1db
Hide 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