DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master

author Xin Li <delphij@google.com>

Tue, 15 Jan 2019 18:17:12 +0000 (10:17 -0800)

committer Xin Li <delphij@google.com>

Tue, 15 Jan 2019 18:17:12 +0000 (10:17 -0800)
author Xin Li <delphij@google.com>
Tue, 15 Jan 2019 18:17:12 +0000 (10:17 -0800)
committer Xin Li <delphij@google.com>
Tue, 15 Jan 2019 18:17:12 +0000 (10:17 -0800)
diff --cc bta/ag/bta_ag_act.cc
Simple merge
diff --cc bta/ag/bta_ag_cmd.cc
Simple merge
diff --cc bta/hh/bta_hh_act.cc
Simple merge
diff --cc stack/mcap/mca_cact.cc
Simple merge
diff --cc stack/sdp/sdp_discovery.cc
Simple merge
author	Xin Li <delphij@google.com>
	Tue, 15 Jan 2019 18:17:12 +0000 (10:17 -0800)
committer	Xin Li <delphij@google.com>
	Tue, 15 Jan 2019 18:17:12 +0000 (10:17 -0800)
		1	2
bta/ag/bta_ag_act.cc	patch \|	diff1 \|	diff2 \|	blob \| history
bta/ag/bta_ag_cmd.cc	patch \|	diff1 \|	diff2 \|	blob \| history
bta/hh/bta_hh_act.cc	patch \|	diff1 \|	diff2 \|	blob \| history
stack/mcap/mca_cact.cc	patch \|	diff1 \|	diff2 \|	blob \| history
stack/sdp/sdp_discovery.cc	patch \|	diff1 \|	diff2 \|	blob \| history