tree d4194f5661ec8fdcda2af0372bf46453acebc760
parent 9523ba3018b28ec7b812de742a21530c9323fd4a
parent 9808ca2ee70777ae1727913278000bf66ccdd29d
author Treehugger Robot <treehugger-gerrit@google.com> 1642908763 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642908763 +0000

Merge "Use 40 seconds for Inquiry in Neighbor Test" am: 426c567aaa am: 9808ca2ee7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1957879

Change-Id: I13f0302f095c36e21954286d951795ee72dd4e16