tree 698c2ea4209a48575846604dbae002f71c28d8b6
parent f5db7f091ef56c0343abc61578ed00c31ba2aae8
parent ba641b73b0447894ae092a4eb078e65f8b490f85
author Automerger <Automerger@Swift> 1510704802 -0800
committer Automerger <Automerger@Swift> 1510704802 -0800

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