tree 3863cb423abe5b9760ebad0553888a1333d2ab19
parent c628d83ec5309cd679e16c734456fed1b9a85806
parent 50edddb7383a0e4aef990a085777f958c5d8a2b8
author Chris Broadfoot <cbro@golang.org> 1470174248 -0700
committer Chris Broadfoot <cbro@golang.org> 1470174266 -0700

all: merge master into release-branch.go1.7

Change-Id: I77d1665af543dc71f30b2afa48eac411de11afc7