tree 88fe1b0524d4ea18ac31ff68f8a30b412aac8794
parent 80cff53e138cca6c2634e08f5ed1198facc7adb6
parent 22ade3c30d83407d19cd3a2b49ead66e6c5e3cf0
author Elliott Hughes <enh@google.com> 1400263412 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400263412 +0000

am 22ade3c3: Merge "With libstdc++ in libc, __futex_wait and __futex_wake can be hidden."

* commit '22ade3c30d83407d19cd3a2b49ead66e6c5e3cf0':
  With libstdc++ in libc, __futex_wait and __futex_wake can be hidden.