tree fca22a147c3fac5f91dd75824e27513ad53b0c9d
parent 9a46240f5db9d0b59de7ecdf907034ff88a89c1b
parent 5114b5eb4c7d38c5a622948fd977e292a635236c
author Automerger <Automerger@Swift> 1485916452 -0800
committer Automerger <Automerger@Swift> 1485916452 -0800

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