Merge "AVDTP: static IOP database for AVDTP SUSPEND"

author Cheney Ni <cheneyni@google.com>

Tue, 2 Feb 2021 05:11:17 +0000 (05:11 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Tue, 2 Feb 2021 05:11:17 +0000 (05:11 +0000)
author Cheney Ni <cheneyni@google.com>
Tue, 2 Feb 2021 05:11:17 +0000 (05:11 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 2 Feb 2021 05:11:17 +0000 (05:11 +0000)
diff --cc bta/av/bta_av_aact.cc
Simple merge
diff --cc device/include/interop.h
Simple merge
author	Cheney Ni <cheneyni@google.com>
	Tue, 2 Feb 2021 05:11:17 +0000 (05:11 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 2 Feb 2021 05:11:17 +0000 (05:11 +0000)
		1	2
bta/av/bta_av_aact.cc	patch \|	diff1 \|	diff2 \|	blob \| history
device/include/interop.h	patch \|	diff1 \|	diff2 \|	blob \| history