tree 4fb2dbacfbb16804f52a56a1c53ede8593d33765
parent 484e3aca0b06a34cbb2f761f2b07e61a2cb493b1
parent 77559201bef4b7e709f77e7ee2a66bdcc903add6
author Colin Cross <ccross@android.com> 1589844068 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1589844068 +0000

Fix golang-protobuf tests am: 34d48059c2 am: b34db27e38 am: 5c0a661709 am: 77559201be

Change-Id: I7037e3181a15b2d5e9dea83f12d3a7c5c16cdd75