tree 994ea757e2453e2ab76899b4ac5a1b08f92b2631
parent c5aff68693dee788a28a0d0256782cc8521aa2a5
parent e7ddcad89f2950d58b4022b55f2cf693daac2e19
author Narayan Kamath <narayan@google.com> 1397559779 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397559779 +0000

am e7ddcad8: am 0f4575db: Merge "HAVE_POSIX_CLOCKS doesn\'t imply CLOCK_BOOTTIME."

* commit 'e7ddcad89f2950d58b4022b55f2cf693daac2e19':
  HAVE_POSIX_CLOCKS doesn't imply CLOCK_BOOTTIME.