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

Commit aa7d7e1d 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: 56e55f58
am: 880bad1c -s ours
am skip reason: subject contains skip directive

Change-Id: I0b7d4b170207a5c6e4404a1a223d0da75d221fd4
parents 0782bf4f 880bad1c
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