| commit | 821ac10bdc64d8f618e32e013794715fc17dd0d1 | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Wed Dec 18 00:31:32 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 18 00:31:32 2013 +0000 |
| tree | 889e7fdcc23584857048d5e890986f9a84fbc236 | |
| parent | 3fd9ca979a56eb09d5ddf3a7e912694a38d1dbcc [diff] | |
| parent | 07dbb562a848af658f65cd41864f31aab5f4b955 [diff] |
am 07dbb562: am 9d1de8a8: am 0e23a3d4: am 215f78ae: Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm" * commit '07dbb562a848af658f65cd41864f31aab5f4b955': toolbox: uptime: use clock_gettime() on devices without /dev/alarm