tree 56a2329f9d9eba62a22db2df486f99c22249a07e
parent bbecdcad08a9858ff72ee817b8b82291723b5cca
parent 016074f6beec46fa2140e2cabd11ade488776402
author Elliott Hughes <enh@google.com> 1401731753 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401731753 +0000

am 016074f6: am 987bd5c6: am 2deef73f: Merge "Avoid a system call in \'gettid\'."

* commit '016074f6beec46fa2140e2cabd11ade488776402':
  Avoid a system call in 'gettid'.