tree e42e27dc1a48051ae60b8ceaf5f6112eb3478de1
parent 209178dacacb5c254926a9d8c72933f23feced9f
author Tim Northover <tnorthover@apple.com> 1386490340 +0000
committer Tim Northover <tnorthover@apple.com> 1386490340 +0000

Merging r196493. Simple conflict due to change API of updated
function.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@196717 91177308-0d34-0410-b5e6-96231b3b80d8