OSDN Git Service

[automerger skipped] Merge "JustWorks: Auto-accept only incoming temporary pairing...
authorMartin Brabham <optedoblivion@google.com>
Thu, 3 Oct 2019 16:28:09 +0000 (09:28 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Oct 2019 16:28:09 +0000 (09:28 -0700)
commitb1d73762ef9072cfb8cbd1c53ee270b540e11f35
tree6a55c2a7d984f1196b5a7efd203115626bb76f24
parentb9385bd521947c393a71cb2cce052868d1fc29da
parentd9633df86a0fe8e4f1026c0d6ee39242191e5c88
[automerger skipped] Merge "JustWorks: Auto-accept only incoming temporary pairing." into pi-dev am: 6c603cedb5 -s ours am: 9665fdd556 -s ours
am: d9633df86a -s ours
am skip reason: change_id I4e3f39bc08e9d9493734a21ea29d76e43aeb50c8 with SHA1 a73dfccf32 is in history

Change-Id: I7684184f8ea9d2a038242c6c9f631c248eb34f64