tree 3dcdceefc80b8b26ed1a2b5aa4fe3f460b3953f7
parent 30fe3050d1e787ff6f74629b237278d902858dce
parent ea86293b0aae2ab43e317256fe042225209de6a0
author Alon Zakai <alonzakai@gmail.com> 1419887427 -0800
committer Alon Zakai <alonzakai@gmail.com> 1420073746 -0800

Merge commit 'ea86293b0aae2ab43e317256fe042225209de6a0' into merge-pnacl-3.5

This merges in PNaCl's clang 3.5.

1.28.3

Conflicts:
	lib/AST/ASTContext.cpp
	lib/Driver/Driver.cpp