| commit | d38ca369c07744abeb5477c6a524a683fb9a4927 | [log] [tgz] |
|---|---|---|
| author | Greg Hackmann <ghackmann@google.com> | Tue Dec 17 16:23:32 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Dec 17 16:23:32 2013 -0800 |
| tree | 754de31252412c9124d382ef9a46fce70e13cc04 | |
| parent | e25864b752db0bc8ddc55f2c22cf1b8bcb2602bf [diff] | |
| parent | 9ade11c1c57edaaf0b9be8a3cb9445ae7fed3337 [diff] |
am 9ade11c1: Merge "SystemClock: use clock_gettime() on devices without /dev/alarm" * commit '9ade11c1c57edaaf0b9be8a3cb9445ae7fed3337': SystemClock: use clock_gettime() on devices without /dev/alarm