tree e4e8c2dfca8e5ce36207c95bd311853755a852f8
parent 85e87c555a98bb327219b2bd3a34e4e6a2137cfe
parent 93dd2f8a29c6b30a902db4136eec465c704fe380
author Andrew Hsieh <andrewhsieh@google.com> 1413342138 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413342138 +0000

am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h"

* commit '93dd2f8a29c6b30a902db4136eec465c704fe380':
  Add missing function prototypes in time.h