tree 9c0295ee5dcc2b1ab53f04106f572c613379046c
parent 68418746f2e8d7c46957b3c17ebd5586cee599f4
parent 228e747b6c40da2945310cda214b829f7de8cb60
author Elliott Hughes <enh@google.com> 1471292240 +0000
committer android-build-merger <android-build-merger@google.com> 1471292240 +0000

Merge "Fix mktime's errno behavior."
am: 228e747b6c

Change-Id: I1f70691679023dd1e187ac8d4d41674272ac4688