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

resolved conflicts for merge of 05292dd6 to jb-mr1-dev
Change-Id: I051cad5dc3c985f11c52708f4487e64ea45ca617
2013-09-25 02:31:23 +00:00 · 2013-09-24 15:52:46 -07:00 · 2013-03-11 12:22:41 -07:00 · 2013-03-11 12:19:03 -07:00 · 2013-03-11 12:15:11 -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	8a6d66c7ef	Merge "resolved conflicts for merge of `05292dd6` to jb-mr1-dev" into jb-mr1.1-dev	2013-09-25 02:31:23 +00:00
Elliott Hughes	61441240d9	resolved conflicts for merge of `05292dd6` to jb-mr1-dev Change-Id: I051cad5dc3c985f11c52708f4487e64ea45ca617	2013-09-24 15:52:46 -07:00
Jean-Baptiste Queru	a4b20d712b	am `b8e1033c`: (-s ours) am `e5412a9a`: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'b8e1033c5b5813cb97d19645075591a357e9f04a':	2013-03-11 12:22:41 -07:00
Jean-Baptiste Queru	b8e1033c5b	am `e5412a9a`: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'e5412a9a9597433ae2540b390269c514c46402f1':	2013-03-11 12:19:03 -07:00
Jean-Baptiste Queru	e5412a9a95	Reconcile with jb-mr1-release - do not merge	2013-03-11 12:15:11 -07:00
@@ -1 +1 @@
 h
 d