Commit 982967ff authored Jun 02, 2019 by Martin Brabham Committed by android-build-merger Jun 02, 2019

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

[automerger skipped] [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 554f747b am: 5a7fb359 am: 6e506a46 am: a03d3eeb skipped: 66bb1914 am: f3efcd70 am: ddb2bf09 am: 6ccb5f66 -s ours am: a3edaf6b -s ours am: eb93b095 am: 5a869992
am: 34f48e69 -s ours
am skip reason: subject contains skip directive

Change-Id: I6f3ddc0c7241dba8b514ac4d131e10819bdc1a59

parents 49dafdb3 34f48e69

There are no changes