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

Commit 83f02b78 authored by Chen Chen's avatar Chen Chen
Browse files

resolve merge conflicts of a8a425bd to sc-dev 

Bug: 160794467
Bug: 178441949
Test: atest BluetoothInstrumentationTests
Merged-In: I5177efac17ea9ccbeecee232bcc321867a19c693
Change-Id: I0c2dd5c89af43fa05aac6a021a9b446308d270f9
parents 3df46ced a8a425bd
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