tree 83d2a1780ad295899ea3ed18dea561f107de76c8
parent 6b8fd05414decfbbe46c8ce8e45ab8384594805e
parent 4994deaef51d5fa1ac12e6160b47d9cbe3b2bc43
author Elliott Hughes <enh@google.com> 1334607166 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1334607166 -0700

am 4994deae: Merge "Bionic: Fix wrong prototype of system call clock_nanosleep"

* commit '4994deaef51d5fa1ac12e6160b47d9cbe3b2bc43':
  Bionic: Fix wrong prototype of system call clock_nanosleep