am 5e8eedd6: am 2a01c3f3: am 93dd2f8a: am b02b4bce: Merge "Add missing function prototypes in time.h"

* commit '5e8eedd60eefbffe1015cf2a31acee4a466aac06':
This commit is contained in:
Andrew Hsieh
2014-10-26 00:51:18 +00:00
committed by Android Git Automerger

Diff Content Not Available