tree ff87e6c2cbf39a6da4c905c8455d787bddc4f56c
parent 0ebf6ce087388cdd501a02ff92f2f8cafc3e1378
parent 243d51f05e5dc263e185f9b1f7f1fe96a2098644
author Chris Broadfoot <cbro@golang.org> 1469129893 -0700
committer Chris Broadfoot <cbro@golang.org> 1469129901 -0700

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

Change-Id: I2511c3f7583887b641c9b3694aae54789fbc5342