tree 139f54265c4ccd64e8550fe24de3ca639fd448c9
parent 46b7e9fb147a1cb3b953969e398ec0c06ebf4ee1
parent adbedcc4b98fb63e3a89baff23002c866fb6317a
author Automerger <Automerger@Swift> 1485220176 -0800
committer Automerger <Automerger@Swift> 1485220176 -0800

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