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

Commit f78f4b06 authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

OPP: Fix minor conflict with internal am: f9587edd 

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



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