From: Martin Brabham Date: Mon, 3 Jun 2019 04:31:26 +0000 (+0000) Subject: Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f-nyc-mr1-dev-nyc... X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=37c691a408ba20a86629b9288020ea578e5e3fe2;p=android-x86%2Fsystem-bt.git Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f-nyc-mr1-dev-nyc-dev" into cw-f-dev * changes: [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6 am: 6097686fc7 [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c am: c80a6ed6e6 [automerger] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP am: 042fe6394c DO NOT MERGE: btif: require pairing dialog for JustWorks SSP --- 37c691a408ba20a86629b9288020ea578e5e3fe2