Merge "Add respond Reject with Invalid parameter for Unknown Capability ID" into...

author Andre Eisenbach <eisenbach@google.com>

Mon, 14 May 2018 19:38:34 +0000 (19:38 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Mon, 14 May 2018 19:38:34 +0000 (19:38 +0000)
author Andre Eisenbach <eisenbach@google.com>
Mon, 14 May 2018 19:38:34 +0000 (19:38 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 14 May 2018 19:38:34 +0000 (19:38 +0000)
diff --cc profile/avrcp/device.cc
Simple merge
diff --cc profile/avrcp/device.h
Simple merge
author	Andre Eisenbach <eisenbach@google.com>
	Mon, 14 May 2018 19:38:34 +0000 (19:38 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 14 May 2018 19:38:34 +0000 (19:38 +0000)
		1	2
profile/avrcp/device.cc	patch \|	diff1 \|	diff2 \|	blob \| history
profile/avrcp/device.h	patch \|	diff1 \|	diff2 \|	blob \| history