resolved conflicts for merge of cc7f0dc5 to jb-dev-plus-aosp

Change-Id: I812d0007ddd1576583a4749461b57ee33fb1eb15
2013-09-13 10:09:56 -07:00 · 2013-09-13 10:09:56 -07:00 · 05292dd65b
commit 05292dd65b
parent ec4326084e cc7f0dc5a1
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 @@
-2012f
+2013d
 @ -1 +1 @@
 f
 d