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

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

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

[automerger skipped] Merge "Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"" into qt-dev am: 43902e35 am: 62d68eba
am: 7f9b1306 -s ours
am skip reason: subject contains skip directive

Change-Id: Id329fd7221f9c03f83cdfa17a4eb82894bf8a762
parents b50784a6 7f9b1306
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