Merge branch 'master' into 11.x · xamarin/GooglePlayServicesComponents@d93860b · GitHub

Commit

Merge branch 'master' into 11.x

Browse files

# Conflicts:
#	auth-base/source/Transforms/Metadata.xml
#	build.cake
#	cast-framework/nuget/Xamarin.GooglePlayServices.Cast.Framework.template.nuspec
#	cast-framework/source/Cast.Framework.csproj
#	cast-framework/source/packages.config
#	support-wearable/source/SupportWearable.csproj
#	tests/GooglePlayServices.Tests/Tests.cs

Loading branch information

Redth committed Dec 8, 2017

2 parents 502d5ad + 1288c79 commit d93860b