tree 435c29104ccd1e99c29b9e64ddf8a43b1d7b7d74
parent 8b326b4ad22a5938f9423864053937942c4e1bf1
parent 7e694a20fd4136f8aca9afa294dae663a49efacc
author Dimitry Ivanov <dimitry@google.com> 1454693162 +0000
committer android-build-merger <android-build-merger@google.com> 1454693162 +0000

Merge "Add check for pthread_self() when looking up a thread" am: b90837c3d3
am: 7e694a20fd

* commit '7e694a20fd4136f8aca9afa294dae663a49efacc':
  Add check for pthread_self() when looking up a thread