tree 142374a133d1bbbb6be6a5addb8ad8ea7cc4ac89
parent 293649665c62b4b125175c40d2591aa7d1a80b1c
parent 20a82813e9e00bdee1ace1bae059339749ad4000
author Automerger <Automerger@Swift> 1506585790 -0700
committer Automerger <Automerger@Swift> 1506585790 -0700

Propagating prior merge from 'llvm.org/release_50'.