tree b5ee53016f6857d7f3064006ba487a7da9757ca6
parent 47316a27eac94c45e47a26cb52cc5b03753dd24e
parent a82b32a7a7855cb93e11e060120803e91cc81c2d
author Dan Albert <danalbert@google.com> 1400277244 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400277244 +0000

am a82b32a7: Merge "Use libc++ versions of gtest libs when needed"

* commit 'a82b32a7a7855cb93e11e060120803e91cc81c2d':
  Use libc++ versions of gtest libs when needed