tree f0ed3fb3bbd0a55fbb0f6f1e49ce1c3ec8f1a3d4
parent 04aa9ad7eb237dae7b6858092bc5e0cc824592bb
parent 23958e1436565b333ce7f3022bc52a10d4732ef6
author Elliott Hughes <enh@google.com> 1420849095 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420849095 +0000

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

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