tree 164419162c0a2a79d96ca949d34572ea7be1f888
parent 400c611d3a71baccdfddb7bb085321d80db43fe4
parent 3dc41967df17d5e4fa8c661ab738760185264ac1
author Elliott Hughes <enh@google.com> 1357669644 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357669644 -0800

am 3dc41967: Merge "bionic now defines _POSIX_MONOTONIC_CLOCK, so dhcpd doesn\'t need to."

* commit '3dc41967df17d5e4fa8c661ab738760185264ac1':
  bionic now defines _POSIX_MONOTONIC_CLOCK, so dhcpd doesn't need to.