Commit 82072dc9 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit '12e3a501':
  Fix pthread_test to work with gtest 1.7.0.
parents 2db157c8 12e3a501
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment