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

Skip to content
Commit 20a049f9 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "[BP CLEANUP] Format bpfmt -s conflict 1/2" am:... 

[automerger skipped] Merge "[BP CLEANUP] Format bpfmt -s conflict 1/2" am: d8df5286 am: 78ac6904 -s ours am: e01d4661 -s ours

am skip reason: Merged-In I0ddc4496ed6fbf785613841eb85a71a4f2a92425 with SHA-1 ebd90ead is already in history

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



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