OSDN Git Service

Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f-nyc-mr1-dev-nyc...
authorMartin Brabham <optedoblivion@google.com>
Mon, 3 Jun 2019 04:31:26 +0000 (04:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 3 Jun 2019 04:31:26 +0000 (04:31 +0000)
commit51fc1da4f666d563fe231d313be1084ce93e449f
tree974a20f68ed9472a819987c3387b666620fcd990
parentdff6cd84bceba1b405a998b283bd0c70ca0d27f9
parent6097686fc7e49c096737e1c9dd089b3e14483f27
Merge changes from topic "am-57169ab6-1d56-417c-b7c3-7aa33855073f-nyc-mr1-dev-nyc-dev" into nyc-mr1-dev

* changes:
  [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