| commit | 9d1de8a81240e6ede714e8ee67cb079132b3e6de | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Wed Dec 18 00:26:08 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 18 00:26:08 2013 +0000 |
| tree | 569618a08ad6f99b53d7d3c6c1fa0359c88833a7 | |
| parent | 70f22d6b7620b5a3a11ef1d8136a4d10efe14670 [diff] | |
| parent | 0e23a3d4830e6a45bf9b4968da7553fab79205a8 [diff] |
am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm" * commit '0e23a3d4830e6a45bf9b4968da7553fab79205a8': toolbox: uptime: use clock_gettime() on devices without /dev/alarm