tree f6ae7bcf3f48627b08faf3a19c0f0b2052902ced
parent ef52e570f2e8bfdf58705c27f9a5b8705f6733c9
parent 7e8743f82ac7957c66d9c2444996be5b1218673b
author Automerger <Automerger@Swift> 1504222649 -0700
committer Automerger <Automerger@Swift> 1504222649 -0700

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