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)
* commit '60b9496c016f81df8f1c4202ba8a5190543900d5':
  "desktop" linux has Posix clocks.


Trivial merge