tree bf08fffa4c3ad007f47ed5d1553202c6babfcebd
parent e352d8ffe5faae4b124d9f4de5f2fc3e8d2981f6
author Tim Murray <timmurray@google.com> 1414099071 -0700
committer The Android Automerger <android-build@google.com> 1414110942 -0700

Apply rL216114 from upstream LLVM.

bug 18094492

Change-Id: Ic049d4123b9240d89daf4f3c5e8d82e8276a84e7