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

Skip to content
Commit ff57b52d authored by Hieu Dang's avatar Hieu Dang
Browse files

[conflict] Merge changes I0779eb81,Ieb8129bf,I9f821fb1 am: 694a060b 

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



Change-Id: I1421e33ae440fbc63e4384abd90f5bbfb4ae7a7e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Ignore-AOSP-First: Merge conflict resolutions
Test: atest BluetoothInstrumentationTests
parents 48677636 694a060b
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