Merge "DO NOT MERGE Revert "A2DP SRC offload support"" into mnc-dr1.5-dev

author Chris Elliott <chriselliott@google.com>

Wed, 2 Dec 2015 21:52:14 +0000 (21:52 +0000)

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

Wed, 2 Dec 2015 21:52:14 +0000 (21:52 +0000)
author Chris Elliott <chriselliott@google.com>
Wed, 2 Dec 2015 21:52:14 +0000 (21:52 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 2 Dec 2015 21:52:14 +0000 (21:52 +0000)
diff --cc bta/av/bta_av_ssm.c
Simple merge
diff --cc btif/src/btif_media_task.c
Simple merge
author	Chris Elliott <chriselliott@google.com>
	Wed, 2 Dec 2015 21:52:14 +0000 (21:52 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 2 Dec 2015 21:52:14 +0000 (21:52 +0000)
		1	2
bta/av/bta_av_ssm.c	patch \|	diff1 \|	diff2 \|	blob \| history
btif/src/btif_media_task.c	patch \|	diff1 \|	diff2 \|	blob \| history