tree 6f69fbc628e075043c3a2ffbd358b09ebd658d96
parent 8960f0546da65d680732aedc8d8472a5a3c941d1
parent e6bb43d8b68ab16a71b060fc32fcba18d20f8828
author Automerger <Automerger@Swift> 1501288598 -0700
committer Automerger <Automerger@Swift> 1501288598 -0700

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