tree 754de31252412c9124d382ef9a46fce70e13cc04
parent 5ae67bebc46a4974869458eb35270b23633aba0c
parent 7510fa3e71e3d42065de44ccf3e0fa50606ecf05
author Greg Hackmann <ghackmann@google.com> 1387326526 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1387326526 +0000

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