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

resolved conflicts for merge of 05292dd6 to jb-mr1-dev
Change-Id: I051cad5dc3c985f11c52708f4487e64ea45ca617
2013-09-25 02:31:09 +00:00 · 2013-09-24 15:52:16 -07:00
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
Author	SHA1	Message	Date
Baligh Uddin	f7a9a681ab	Merge "resolved conflicts for merge of `05292dd6` to jb-mr1-dev" into jb-mr1-dev	2013-09-25 02:31:09 +00:00
Elliott Hughes	1d69ab1de9	resolved conflicts for merge of `05292dd6` to jb-mr1-dev Change-Id: I051cad5dc3c985f11c52708f4487e64ea45ca617	2013-09-24 15:52:16 -07:00
@@ -1 +1 @@
 h
 d