tree 97bb7a00c975041f6e297fe7ff53a8b116f405bf
parent 328b2b6bfb73ee5bded6719ac15e0a3381c1800f
parent 176e71fb52d4ba380404280aade630b29708f002
author Elliott Hughes <enh@google.com> 1400727884 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400727884 +0000

am 176e71fb: am 3d4a7b02: Merge "Hide most of the private futex functions."

* commit '176e71fb52d4ba380404280aade630b29708f002':
  Hide most of the private futex functions.