tree 31930a291c99fe616059e735ef57023eff11a9c7
parent 2d8fe5b848a40bbd8a479c6096cbd76ba655d569
parent 4d7108a1b28142ea600f301b919dfb8c057b97d4
author Stephen Hines <srhines@google.com> 1440672567 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440672567 +0000

am 4d7108a1: (-s ours) am 0248f898: am 335e0bb9: Merge "Add libLLVM to LOCAL_LDLIBS so that the mac build can link correctly."

* commit '4d7108a1b28142ea600f301b919dfb8c057b97d4':