OSDN Git Service

Merge "Revert "DO NOT MERGE: btif: require pairing dialog for JustWorks SSP"" into...
authorMartin Brabham <optedoblivion@google.com>
Wed, 19 Jun 2019 04:15:34 +0000 (21:15 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Jun 2019 04:15:34 +0000 (21:15 -0700)
am: bf0a90a1f8

Change-Id: I757e61b53bd6b0ee374722870c8dbb52323ecc17


Trivial merge