tree d517da7418d6335a88ab24ec9e9e80db1b4df043
parent 62e5355fdd649171dc601b88a2a15e69061e7890
parent 91911e39f0fdfecc5453f9eca7ff74215ffb28a2
author Chris Broadfoot <cbro@golang.org> 1454537509 -0800
committer Chris Broadfoot <cbro@golang.org> 1454537552 -0800

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

Change-Id: Ifbe63b764e3d6933b112a4307a3701a047227976