bionic

Author	SHA1	Message	Date
Elliott Hughes	592c07084b	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
Elliott Hughes	b30f6eb026	am `9e6104d5`: resolved conflicts for merge of `05292dd6` to jb-mr1-dev * commit '9e6104d54f541d43d3c1b785f2dfc1d2e09c0f2f': Upgrade pre-jb-mr2 releases to tzdata2013d.	2013-09-13 10:51:31 -07:00
Elliott Hughes	9e6104d54f	resolved conflicts for merge of `05292dd6` to jb-mr1-dev Change-Id: I051cad5dc3c985f11c52708f4487e64ea45ca617	2013-09-13 10:17:10 -07:00
Elliott Hughes	05292dd65b	resolved conflicts for merge of `cc7f0dc5` to jb-dev-plus-aosp Change-Id: I812d0007ddd1576583a4749461b57ee33fb1eb15	2013-09-13 10:09:56 -07:00
Elliott Hughes	cc7f0dc5a1	Upgrade pre-jb-mr2 releases to tzdata2013d. From the release notes: Changes affecting future time stamps: Morocco's midsummer transitions this year are July 7 and August 10, not July 9 and August 8. (Thanks to Andrew Paprocki.) Israel now falls back on the last Sunday of October. (Thanks to Ephraim Silverberg.) Changes affecting past time stamps: Specify Jerusalem's location more precisely; this changes the pre-1880 times by 2 s. Changing affecting metadata only: Fix typos in the entries for country codes BQ and SX. Change-Id: I8caa139f0eecbe038643df43a27088278c6185cd	2013-09-13 09:43:15 -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