tree 754de31252412c9124d382ef9a46fce70e13cc04
parent e25864b752db0bc8ddc55f2c22cf1b8bcb2602bf
parent 9ade11c1c57edaaf0b9be8a3cb9445ae7fed3337
author Greg Hackmann <ghackmann@google.com> 1387326212 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1387326212 -0800

am 9ade11c1: Merge "SystemClock: use clock_gettime() on devices without /dev/alarm"

* commit '9ade11c1c57edaaf0b9be8a3cb9445ae7fed3337':
  SystemClock: use clock_gettime() on devices without /dev/alarm