OSDN Git Service

[automerger skipped] Merge "DO NOT MERGE: btif: require pairing dialog for JustWorks...
authorMartin Brabham <optedoblivion@google.com>
Mon, 3 Jun 2019 15:51:42 +0000 (08:51 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 3 Jun 2019 15:51:42 +0000 (08:51 -0700)
am: 14a23759f6

Change-Id: I98a220f040b32092cee5434c91d56ee8558b2c83


Trivial merge