tree 5009066d2a9913f6ed372fa795e2e8872a05cbd5
parent 757d9ae051887ddce30b9dfb91bf9fa7b595dbec
parent fe5e156da55923b1667eaabfb243ae20cca2e8a6
author Martin Brabham <optedoblivion@google.com> 1570120089 -0700
committer android-build-merger <android-build-merger@google.com> 1570120089 -0700

[automerger skipped] Merge "JustWorks: Auto-accept only incoming temporary pairing." into pi-dev am: 1f8cb004da -s ours am: 96db9f706e -s ours
am: fe5e156da5 -s ours
am skip reason: change_id I4e3f39bc08e9d9493734a21ea29d76e43aeb50c8 with SHA1 ab1ee5c295 is in history

Change-Id: I7684184f8ea9d2a038242c6c9f631c248eb34f64