tree b02c16ea2c21599718cde956ddce100465ca47f2
parent 9db5c4dc24e34676e29ede060f09347e9855fea6
parent a6d55d97a5aab126f77dc62fb215b9085da0ae7f
author Automerger <Automerger@Swift> 1487884920 -0800
committer Automerger <Automerger@Swift> 1487884920 -0800

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