tree 55663e2385132dcfa213b7909ae026e12e96f900
parent 0612f83a8aec90d205399287f986c92d37eaa384
parent 3c901e3c4d467e5305763e236db4fc6ffaa3ec42
author Automerger <Automerger@Swift> 1506651875 -0700
committer Automerger <Automerger@Swift> 1506651875 -0700

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