tree daac8cea79278c08ed84b286febd9c9fddb58e9a
parent 7bd2a627f633f4bc201a279f736cefac399bc607
parent 7f8eb7feed0f8c2d826921675a5e1297bb037643
author David G. Quintas <dgq@google.com> 1486665733 -0800
committer GitHub <noreply@github.com> 1486665733 -0800

Merge pull request #9653 from grpc/revert-9606-port-9488

Revert "Port #9488 and part of #9463"