Updates #4734. R=golang-dev, adg CC=golang-dev https://golang.org/cl/7228079
Attach a file by drag & drop or click to upload
