am 12e3a501: am 037b10d0: Merge "Fix pthread_test to work with gtest 1.7.0."
authorElliott Hughes <enh@google.com>
Wed, 29 Jan 2014 01:51:07 +0000 (01:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 29 Jan 2014 01:51:07 +0000 (01:51 +0000)
commit82072dc9327572f93bcc26331402ca7874a124d1
tree9f2062d2a222d79dc70d3b81bd608e91a28ffb70
parent2db157c853cb35243d49fd1e084c1fb444f9ba02
parent12e3a5019a8bedcdac27470da92f81b5f7fd7b5b
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.