From 1d69ab1de934e7d8487bf903204976b9d9b33143 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 13 Sep 2013 10:17:10 -0700 Subject: resolved conflicts for merge of 05292dd6 to jb-mr1-dev Change-Id: I051cad5dc3c985f11c52708f4487e64ea45ca617 --- libc/zoneinfo/zoneinfo.dat | Bin 499422 -> 518429 bytes libc/zoneinfo/zoneinfo.idx | Bin 29848 -> 30108 bytes libc/zoneinfo/zoneinfo.version | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat index cb0507a41..97b79b805 100644 Binary files a/libc/zoneinfo/zoneinfo.dat and b/libc/zoneinfo/zoneinfo.dat differ diff --git a/libc/zoneinfo/zoneinfo.idx b/libc/zoneinfo/zoneinfo.idx index c93b63797..b70213292 100644 Binary files a/libc/zoneinfo/zoneinfo.idx and b/libc/zoneinfo/zoneinfo.idx differ diff --git a/libc/zoneinfo/zoneinfo.version b/libc/zoneinfo/zoneinfo.version index 73bb41781..278f45d67 100644 --- a/libc/zoneinfo/zoneinfo.version +++ b/libc/zoneinfo/zoneinfo.version @@ -1 +1 @@ -2012h +2013d -- cgit v1.2.3