DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master

author Xin Li <delphij@google.com>

Mon, 10 Dec 2018 22:22:38 +0000 (14:22 -0800)

committer Xin Li <delphij@google.com>

Tue, 11 Dec 2018 00:29:06 +0000 (00:29 +0000)
author Xin Li <delphij@google.com>
Mon, 10 Dec 2018 22:22:38 +0000 (14:22 -0800)
committer Xin Li <delphij@google.com>
Tue, 11 Dec 2018 00:29:06 +0000 (00:29 +0000)
diff --cc bta/ag/bta_ag_sdp.cc
Simple merge
diff --cc btif/src/btif_hd.cc
Simple merge
diff --cc stack/avrc/avrc_pars_ct.cc
Simple merge
diff --cc stack/l2cap/l2c_fcr.cc
Simple merge
diff --cc stack/sdp/sdp_discovery.cc
Simple merge
author	Xin Li <delphij@google.com>
	Mon, 10 Dec 2018 22:22:38 +0000 (14:22 -0800)
committer	Xin Li <delphij@google.com>
	Tue, 11 Dec 2018 00:29:06 +0000 (00:29 +0000)
		1	2
bta/ag/bta_ag_sdp.cc	patch \|	diff1 \|	diff2 \|	blob \| history
btif/src/btif_hd.cc	patch \|	diff1 \|	diff2 \|	blob \| history
stack/avrc/avrc_pars_ct.cc	patch \|	diff1 \|	diff2 \|	blob \| history
stack/l2cap/l2c_fcr.cc	patch \|	diff1 \|	diff2 \|	blob \| history
stack/sdp/sdp_discovery.cc	patch \|	diff1 \|	diff2 \|	blob \| history