commit | 0e23a3d4830e6a45bf9b4968da7553fab79205a8 | [log] [tgz] |
---|---|---|
author | Greg Hackmann <ghackmann@google.com> | Tue Dec 17 16:23:33 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 17 16:23:33 2013 -0800 |
tree | d6652365b73218bdcbc30db93f68074c5e43b33b | |
parent | 066a3862a38957fdcd5f20caa63c7931e9a0f433 [diff] | |
parent | 215f78ae55b479ca6a78f9762ea9920fea16cf45 [diff] |
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