tree ee7d9e2d3d4540e44e6f0ace75a5897f3f5f71c0
parent b773a8d517189a06c54d8ed789806ed42aa42be0
parent 780c43208c9bdd1cacb18bf191b49d37a06cc19a
author Elliott Hughes <enh@google.com> 1421089255 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1421089255 +0000

am 780c4320: Merge "Remove HAVE_POSIX_CLOCKS."

* commit '780c43208c9bdd1cacb18bf191b49d37a06cc19a':
  Remove HAVE_POSIX_CLOCKS.