tree feebc737c21b11808f1ad49a6f4e6f4a394e9386
parent e230f121b5b6a83c82cf8bbccf1cd1bfb21160b8
parent e2f8aeba82f7911ea380ed6ffbe367adcb087af3
author Martin Brabham <optedoblivion@google.com> 1574835439 -0800
committer android-build-merger <android-build-merger@google.com> 1574835439 -0800

Merge "SecurityManager: Classic Pairing Handler" am: 1b410fbbec am: c0a38331b8
am: e2f8aeba82

Change-Id: Ief4dd8be306150a26ae7878d9a921693a03bd608