OSDN Git Service

[automerger skipped] DO NOT MERGE: btif: require pairing dialog for JustWorks SSP...
authorMartin Brabham <optedoblivion@google.com>
Mon, 3 Jun 2019 05:42:27 +0000 (22:42 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 3 Jun 2019 05:42:27 +0000 (22:42 -0700)
am: 6eded7543a

Change-Id: I3392b0dffc7f630ad2ebf06d817c717415c4c1d5


Trivial merge