Merge dates and timestamps properly.#4015

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

lukesneeringer:issue-3981lukesneeringer/google-cloud-python:issue-3981Copy head branch name to clipboard