tree 69da20cda7ad90f7f6435cf7bcf7e5625aa4995d
parent 5eb1f1fbf1b62870a0c44088dd8046b7b87239dc
parent 5baea1436371dea7e14562b17431bcd2b6a55f7d
author Dan Albert <danalbert@google.com> 1444934922 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444934922 +0000

am 5baea143: Merge "Use libgcov OR libclang_rt.profile, not both."

* commit '5baea1436371dea7e14562b17431bcd2b6a55f7d':
  Use libgcov OR libclang_rt.profile, not both.