resolved conflicts for merge of 05292dd6 to jb-mr1-dev

Change-Id: I051cad5dc3c985f11c52708f4487e64ea45ca617
2013-09-13 10:17:10 -07:00 · 2013-09-13 10:17:10 -07:00 · 9e6104d54f
commit 9e6104d54f
parent e5412a9a95 05292dd65b
3 changed files with 1 additions and 1 deletions
--- a/libc/zoneinfo/zoneinfo.dat
+++ b/libc/zoneinfo/zoneinfo.dat
--- a/libc/zoneinfo/zoneinfo.idx
+++ b/libc/zoneinfo/zoneinfo.idx
--- a/libc/zoneinfo/zoneinfo.version
+++ b/libc/zoneinfo/zoneinfo.version
@ -1 +1 @@
-2012h
+2013d
 @ -1 +1 @@
 h
 d