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

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

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

[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP" into oc-dev am: 357a36f3 am: b3bdb9e3 am: 7db943f6 -s ours am: 5b2a1e6d -s ours
am: 57c858a4

Change-Id: I98a220f040b32092cee5434c91d56ee8558b2c83
parents c9dbe867 57c858a4
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