tree a1a0315cbe320aaf3f7f39b60fa4a28fae26af92
parent af2640d72b5ae2efc7c1143ed86acad09c63e78c
parent 3c8961bedc65c9a15cbe67a2ef385a0938f7cfef
author Automerger <Automerger@Swift> 1496249286 -0700
committer Automerger <Automerger@Swift> 1496249286 -0700

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