auto import //branches/master/...@140412
diff --git a/libc/include/time.h b/libc/include/time.h
index 35c2358..fa1da48 100644
--- a/libc/include/time.h
+++ b/libc/include/time.h
@@ -79,9 +79,28 @@
extern char* strptime(const char *buf, const char *fmt, struct tm *tm);
extern size_t strftime(char *s, size_t max, const char *format, const struct tm *tm);
+/* ANDROID-BEGIN */
+struct strftime_locale {
+ const char * mon[12];
+ const char * month[12];
+ const char * wday[7];
+ const char * weekday[7];
+ const char * X_fmt;
+ const char * x_fmt;
+ const char * c_fmt;
+ const char * am;
+ const char * pm;
+ const char * date_fmt;
+};
+
+extern size_t strftime_tz(char *s, size_t max, const char *format, const struct tm *tm, const struct strftime_locale* lc);
+/* ANDROID-END */
+
extern char *ctime(const time_t *timep);
extern char *ctime_r(const time_t *timep, char *buf);
+extern void tzset(void);
+
/* global includes */
extern char* tzname[];
extern int daylight;