| commit | ad238b9e08c313f12994a54d0b89ba61335fa1c9 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon May 12 23:30:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 12 23:30:21 2014 +0000 |
| tree | db34eca2da5ec1662b262862fc44c323209fcb14 | |
| parent | 5b22817c055942051761ae412bbcf75d7ef8f55c [diff] | |
| parent | b29c3e64d25254c7dfd67586ff4d5881ba5fa492 [diff] |
am b29c3e64: am a1f8afa9: am d954c6b9: am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks." * commit 'b29c3e64d25254c7dfd67586ff4d5881ba5fa492':