tree bbb2b6a18d33694a55a54b08a2a0e97685a28898
parent d4558e7cf7f0517997e0628c091e70375d8f4e14
parent 3566fe27f755b48da872610ac4036027db145f7b
author Tim Murray <timmurray@google.com> 1394845381 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1394845381 -0700

am 3566fe27: Merge "Fix build break by not building compiler-rt without clang."

* commit '3566fe27f755b48da872610ac4036027db145f7b':
  Fix build break by not building compiler-rt without clang.