Add both P12 config and JSON credentials#1175

tseaver merged 1 commit intogoogleapis:mastergoogleapis/google-cloud-python:masterfrom

daspecster:daspecster-json-app-credentialsdaspecster/google-cloud-python:daspecster-json-app-credentialsCopy head branch name to clipboard