update other code to match. R=r CC=golang-dev https://golang.org/cl/1680044
Attach a file by drag & drop or click to upload
