tree 32c3f948a98aeaa7b44c9d4fecc39b3d7ccc0708
parent 55410c4e62c478a5a85f428f28dbeab4a5c908d9
parent 9da414f95e06979e60b48380afbf5372c1ef0ef3
author Elliott Hughes <enh@google.com> 1420850560 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420850560 +0000

am 9da414f9: Merge "Linux always has POSIX clocks available."

* commit '9da414f95e06979e60b48380afbf5372c1ef0ef3':
  Linux always has POSIX clocks available.