tree 358ec75952dcc8ce6e09621f6cf3568b5d941c2a
parent 69161e279e05e91f73d824328f0a92cc7716fcf4
parent d47bcd157cdf0e937dbca01939d0c287e7c49acd
author Austin Clements <austin@google.com> 1472140493 -0400
committer Austin Clements <austin@google.com> 1472140508 -0400

[dev.garbage] Merge branch 'master' into dev.garbage

This merges master as of the Go 1.7 release.

Change-Id: I95ac0f96a0837173a2b8d7e8aaadf6fecc1baeaf