| commit | 0f7c043ba89de91cb9531645893f3cb79e15ced5 | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Wed Dec 18 00:28:46 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 18 00:28:46 2013 +0000 |
| tree | 754de31252412c9124d382ef9a46fce70e13cc04 | |
| parent | 5ae67bebc46a4974869458eb35270b23633aba0c [diff] | |
| parent | 7510fa3e71e3d42065de44ccf3e0fa50606ecf05 [diff] |
am 7510fa3e: am d38ca369: am 9ade11c1: Merge "SystemClock: use clock_gettime() on devices without /dev/alarm" * commit '7510fa3e71e3d42065de44ccf3e0fa50606ecf05': SystemClock: use clock_gettime() on devices without /dev/alarm