Merge "Fix potential race condition on CTS TC pthread_gettid_np" into marshmallow...

author Daniel Xie <dxie@google.com>

Wed, 11 Nov 2015 19:24:46 +0000 (19:24 +0000)

committer android-build-merger <android-build-merger@google.com>

Wed, 11 Nov 2015 19:24:46 +0000 (19:24 +0000)
author Daniel Xie <dxie@google.com>
Wed, 11 Nov 2015 19:24:46 +0000 (19:24 +0000)
committer android-build-merger <android-build-merger@google.com>
Wed, 11 Nov 2015 19:24:46 +0000 (19:24 +0000)
diff --cc tests/pthread_test.cpp

index 9f887e3,e210255..fc64d44

mode 100644,100755..100755
--- 1/tests/pthread_test.cpp
--- 2/tests/pthread_test.cpp
+++ b/tests/pthread_test.cpp
author	Daniel Xie <dxie@google.com>
	Wed, 11 Nov 2015 19:24:46 +0000 (19:24 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 11 Nov 2015 19:24:46 +0000 (19:24 +0000)