OSDN Git Service

am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks."
authorNarayan Kamath <narayan@google.com>
Tue, 15 Apr 2014 11:06:26 +0000 (11:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Apr 2014 11:06:26 +0000 (11:06 +0000)
commitd954c6b92024fbb183ea3acb7366a39765a6e3c0
tree6e00c37c4e8cde8a21d1f03d0bee7ca888a2fa35
parent554bb7b61081e80d79bf29a3690ba6fff391df55
parent60b9496c016f81df8f1c4202ba8a5190543900d5
am 60b9496c: am 22261a3f: Merge ""desktop" linux has Posix clocks."

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