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

Commit b50784a6 authored by Martin Brabham's avatar Martin Brabham Committed by android-build-merger
Browse files

[automerger skipped] Revert "DO NOT MERGE: btif: require pairing dialog for... 

[automerger skipped] Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" am: 433db92f am: 74478f4b
am: a6fe3dc8 -s ours
am skip reason: subject contains skip directive

Change-Id: I25e16bd80ee855f77041d93ffd259fb3cc0b3233
parents a9ef2bc6 a6fe3dc8
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