tree 3cdfd01331d484450a3d1739480d0e606a4540fe
parent ee7ed02077f1acd5d27575177f4edf2c6939c2e4
parent a7dcab6954467fa3726824a099b83d0e7490d6d5
author Elliott Hughes <enh@google.com> 1420848852 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420848852 +0000

am a7dcab69: Merge "We have POSIX clocks, and we don\'t need to ask for the openssl headers."

* commit 'a7dcab6954467fa3726824a099b83d0e7490d6d5':
  We have POSIX clocks, and we don't need to ask for the openssl headers.