am b30f6eb0: am 9e6104d5: resolved conflicts for merge of 05292dd6 to jb-mr1-dev

* commit 'b30f6eb026db05c969afacc758e529e73f0e314d': Upgrade pre-jb-mr2 releases to tzdata2013d.
2013-09-13 10:53:43 -07:00 · 2013-09-13 10:53:43 -07:00 · 592c07084b
commit 592c07084b
parent a4b20d712b b30f6eb026
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