tree 9ca926a8216460c79917f47b179321a508ae0958
parent cba215dd3241ae62416800f8d97d114d8a6e1a9a
parent 472a48585ec1cfb66c5716f85b0efdf528b29f5d
author Elliott Hughes <enh@google.com> 1390960234 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390960234 +0000

am 472a4858: Merge "gtest needs -lpthread."

* commit '472a48585ec1cfb66c5716f85b0efdf528b29f5d':
  gtest needs -lpthread.