tree c807a77ac844a15af5a6bee197ac792010e62c9a
parent 412944484c775d86d677e1dce38b923e27b437b0
parent 919a6fbeab6e4eb73c2cca596ca79ae1a2abda34
author Keith Randall <khr@golang.org> 1427921468 -0700
committer Keith Randall <khr@golang.org> 1427921498 -0700

[dev.ssa] Merge remote-tracking branch 'origin/master' into merge

Semi-regular merge of tip into dev.ssa.

Change-Id: I6f96b3b2b1b52e0e2ae5451767051fbd42ae0dbe