tree d6652365b73218bdcbc30db93f68074c5e43b33b
parent e75af5745440eb70d1f5682168edb84eaa631982
parent 9d1de8a81240e6ede714e8ee67cb079132b3e6de
author Greg Hackmann <ghackmann@google.com> 1387326528 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387326528 +0000

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

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