tree 9f2062d2a222d79dc70d3b81bd608e91a28ffb70
parent 2db157c853cb35243d49fd1e084c1fb444f9ba02
parent 12e3a5019a8bedcdac27470da92f81b5f7fd7b5b
author Elliott Hughes <enh@google.com> 1390960267 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1390960267 +0000

am 12e3a501: am 037b10d0: Merge "Fix pthread_test to work with gtest 1.7.0."

* commit '12e3a5019a8bedcdac27470da92f81b5f7fd7b5b':
  Fix pthread_test to work with gtest 1.7.0.