tree 6e00c37c4e8cde8a21d1f03d0bee7ca888a2fa35
parent 554bb7b61081e80d79bf29a3690ba6fff391df55
parent 60b9496c016f81df8f1c4202ba8a5190543900d5
author Narayan Kamath <narayan@google.com> 1397559986 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397559986 +0000

am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks."

* commit '60b9496c016f81df8f1c4202ba8a5190543900d5':
  "desktop" linux has Posix clocks.