tree 03cfd80d3ae4d33233872ef2ecf49eacee970499
parent 57624859f854580f379b61d91800017334e089ef
parent 850646edf7e605354c66693c16ab69193e04a078
author Automerger <Automerger@Swift> 1484594015 -0800
committer Automerger <Automerger@Swift> 1484594015 -0800

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