Merge branch '3.6.0' into 4.0.0

author Samantha Houts <samantha.houts@xamarin.com>

Wed, 13 Mar 2019 22:40:27 +0000 (15:40 -0700)

committer Samantha Houts <samantha.houts@xamarin.com>

Wed, 13 Mar 2019 22:40:27 +0000 (15:40 -0700)
author Samantha Houts <samantha.houts@xamarin.com>
Wed, 13 Mar 2019 22:40:27 +0000 (15:40 -0700)
committer Samantha Houts <samantha.houts@xamarin.com>
Wed, 13 Mar 2019 22:40:27 +0000 (15:40 -0700)
diff --cc Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems
Simple merge
diff --cc Xamarin.Forms.Platform.Android/Forms.cs
Simple merge
diff --cc Xamarin.Forms.Xaml.UnitTests/DesignTimeLoaderTests.cs
Simple merge
author	Samantha Houts <samantha.houts@xamarin.com>
	Wed, 13 Mar 2019 22:40:27 +0000 (15:40 -0700)
committer	Samantha Houts <samantha.houts@xamarin.com>
	Wed, 13 Mar 2019 22:40:27 +0000 (15:40 -0700)
		1	2
Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Xamarin.Forms.Controls.Issues.Shared.projitems	patch \|	diff1 \|	diff2 \|	blob \| history
Xamarin.Forms.Platform.Android/Forms.cs	patch \|	diff1 \|	diff2 \|	blob \| history
Xamarin.Forms.Xaml.UnitTests/DesignTimeLoaderTests.cs	patch \|	diff1 \|	diff2 \|	blob \| history