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

* commit '2a01c3f3f9a4b1a751c95617ddec17e92520440a':
This commit is contained in:
Andrew Hsieh
2014-10-25 19:53:34 +00:00
committed by Android Git Automerger

Diff Content Not Available