tree d6652365b73218bdcbc30db93f68074c5e43b33b
parent 066a3862a38957fdcd5f20caa63c7931e9a0f433
parent 215f78ae55b479ca6a78f9762ea9920fea16cf45
author Greg Hackmann <ghackmann@google.com> 1387326213 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387326213 -0800

am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"

* commit '215f78ae55b479ca6a78f9762ea9920fea16cf45':
  toolbox: uptime: use clock_gettime() on devices without /dev/alarm