A+C: Kyle Lemons (individual CLA)

R=gri
CC=golang-dev
https://golang.org/cl/3766045
2 files changed