tree 4f6746f4e073ffb12298d1631aa533f1e23698a8
parent 40cc40843d88f79b151b7880f33e59a96f4f0182
parent ff50e75d69b5cee253c213f91999e8f6f6129c58
author Elliott Hughes <enh@google.com> 1423015159 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423015159 +0000

am ff50e75d: Merge "Fix pthread_t confusion."

* commit 'ff50e75d69b5cee253c213f91999e8f6f6129c58':
  Fix pthread_t confusion.