tree f1337fde297b5ca3f9d5c17789031f717bdfe63c
parent 9a43481b084c6d50d36c841596eefff773caf260
parent 0e40c373f017eebf2aa5c4610ca721788b918aa7
author Stephen Hines <srhines@google.com> 1401491736 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401491736 +0000

am 0e40c373: Merge "Fix up MCLinker build to work with LLVM 3.5 (r209713)."

* commit '0e40c373f017eebf2aa5c4610ca721788b918aa7':
  Fix up MCLinker build to work with LLVM 3.5 (r209713).