tree 6f0622cfb480ab0c501fe9c91b3d8826fea66a24
parent 41ae572f9d9e40aea58f90205e8d29894b3f0a97
parent 69139a5aa58c0b85fc0d0e9763baa3b52a327e29
author Andrew Hsieh <andrewhsieh@google.com> 1384482838 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384482838 -0800

am 69139a5a: Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8"

* commit '69139a5aa58c0b85fc0d0e9763baa3b52a327e29':
  Added missing clock_settime()/clock_nanosleep() in time.h API>=8