tree d5c44b01548dd29472c309916a9511ab1308621e
parent 83fd6375f6d9016afe9bb03453d39b8c41cda548
parent 47d374ec27af7bc431a86a592822fbb15ff6ba3c
author Elliott Hughes <enh@google.com> 1396909878 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396909878 +0000

am 47d374ec: Merge "Move date off the non-portable bionic32 \'strtotimeval\'."

* commit '47d374ec27af7bc431a86a592822fbb15ff6ba3c':
  Move date off the non-portable bionic32 'strtotimeval'.