Merge "AVRCP: Cancel all pending messages and prevent future messages after cleanup...

author Andre Eisenbach <eisenbach@google.com>

Thu, 24 May 2018 01:10:14 +0000 (18:10 -0700)

committer android-build-merger <android-build-merger@google.com>

Thu, 24 May 2018 01:10:14 +0000 (18:10 -0700)
author Andre Eisenbach <eisenbach@google.com>
Thu, 24 May 2018 01:10:14 +0000 (18:10 -0700)
committer android-build-merger <android-build-merger@google.com>
Thu, 24 May 2018 01:10:14 +0000 (18:10 -0700)
diff --cc btif/avrcp/avrcp_service.cc
Simple merge
diff --cc btif/src/btif_core.cc
Simple merge
author	Andre Eisenbach <eisenbach@google.com>
	Thu, 24 May 2018 01:10:14 +0000 (18:10 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 24 May 2018 01:10:14 +0000 (18:10 -0700)
		1	2
btif/avrcp/avrcp_service.cc	patch \|	diff1 \|	diff2 \|	blob \| history
btif/src/btif_core.cc	patch \|	diff1 \|	diff2 \|	blob \| history