tree 120557982b8667300ca936e7fcae61036fc450a2
parent c6596596c103623b9f9e1442f172b1d5a51336a9
parent 232230afd349ceeb784720d2266e2288523d871f
author Automerger <Automerger@Swift> 1506729673 -0700
committer Automerger <Automerger@Swift> 1506729673 -0700

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