tree 032b6e512dd4fda53bcc2c53e98dbab1c082afa5
parent 1513df12ee74aa100b9050a5e6391eba9775e9af
parent 870923f42a1b206e80872b6bdd878c345f4e0b68
author Automerger <Automerger@Swift> 1486164093 -0800
committer Automerger <Automerger@Swift> 1486164093 -0800

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