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:54:15 +0000 (22:54 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 3 Jun 2019 05:54:15 +0000 (22:54 -0700)
am: cc7bc6b657 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibc7adffce927709c1e9395e61a5f894671d02c50


Trivial merge