Elliott Hughes
417834b17e
am eb370aa3
: Merge "Make bionic look in /data/misc for tzdata updates."
...
* commit 'eb370aa31dd549ad7a7a2044dedab1140a7aeda9':
Make bionic look in /data/misc for tzdata updates.
2012-10-22 11:53:22 -07:00
Elliott Hughes
eb370aa31d
Merge "Make bionic look in /data/misc for tzdata updates."
2012-10-22 11:37:26 -07:00
Elliott Hughes
1c29572034
Make bionic look in /data/misc for tzdata updates.
...
Bug: 7012465
Change-Id: I4d1018f686f2409600fdb6630732cae33efe8f02
2012-10-22 11:34:05 -07:00
Elliott Hughes
1b62d4e72e
am 629a28cd
: am dc595d83
: Merge "Change ZoneCompator to generate the single "tzdata" file."
...
* commit '629a28cdf384d83a4d433de8e1299b01e42cc75e':
Change ZoneCompator to generate the single "tzdata" file.
2012-10-19 17:24:22 -07:00
Elliott Hughes
421083359e
am 58d08711
: am 7a85c42b
: Merge "Update generate-NOTICE.py to know about tzdata."
...
* commit '58d08711af5e8237d6196652d59cc4e8b8caafcf':
Update generate-NOTICE.py to know about tzdata.
2012-10-19 17:24:21 -07:00
Elliott Hughes
629a28cdf3
am dc595d83
: Merge "Change ZoneCompator to generate the single "tzdata" file."
...
* commit 'dc595d830898e5859bf98d7436af2a777a11f810':
Change ZoneCompator to generate the single "tzdata" file.
2012-10-19 17:21:41 -07:00
Elliott Hughes
58d08711af
am 7a85c42b
: Merge "Update generate-NOTICE.py to know about tzdata."
...
* commit '7a85c42b8f7af801a31208ed83589b5397baee73':
Update generate-NOTICE.py to know about tzdata.
2012-10-19 17:21:40 -07:00
Elliott Hughes
dc595d8308
Merge "Change ZoneCompator to generate the single "tzdata" file."
2012-10-19 17:12:37 -07:00
Elliott Hughes
7a85c42b8f
Merge "Update generate-NOTICE.py to know about tzdata."
2012-10-19 17:07:46 -07:00
The Android Automerger
5ba74660e3
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-19 15:45:58 -07:00
Elliott Hughes
5b1497acdb
Change ZoneCompator to generate the single "tzdata" file.
...
Also remove the obsolete individual files, and the temporary script
that converted between the formats.
Bug: 7012465
Change-Id: I5a4030098e4d53e747fd6d395df2679d1567ee1f
2012-10-19 15:45:46 -07:00
Elliott Hughes
4612763b44
Update generate-NOTICE.py to know about tzdata.
...
Also regenerate the NOTICE files. One had slipped behind.
Bug: 7012465
Change-Id: Ice2e909b521472eb1acd53d8151038bebe19984a
2012-10-19 14:55:19 -07:00
Elliott Hughes
933746ad7d
am af72df5b
: am e75c273a
: Merge "Track the tzdata2012g update in the new file format."
...
* commit 'af72df5b98944cfb89cecb7abc05bceec0612981':
Track the tzdata2012g update in the new file format.
2012-10-19 14:42:05 -07:00
Elliott Hughes
af72df5b98
am e75c273a
: Merge "Track the tzdata2012g update in the new file format."
...
* commit 'e75c273ac434043153f22b1c2f89c042928407bc':
Track the tzdata2012g update in the new file format.
2012-10-19 14:40:25 -07:00
Elliott Hughes
e75c273ac4
Merge "Track the tzdata2012g update in the new file format."
2012-10-19 14:30:05 -07:00
Elliott Hughes
8af5412efc
Track the tzdata2012g update in the new file format.
...
Change-Id: Id18aeb1122df769d83c4be06fbf37681231e79f0
2012-10-19 14:28:56 -07:00
Elliott Hughes
bde97cf154
am 98533cfa
: am 88cd1a21
: Merge "Upgrade to tzdata2012g."
...
* commit '98533cfa4b69d053e111e46bc74d8e9b2035a96e':
Upgrade to tzdata2012g.
2012-10-19 13:53:21 -07:00
Elliott Hughes
18ee86f892
am f0af78c2
: am 551ca77e
: Merge "Do all the zoneinfo.* file generation in Java."
...
* commit 'f0af78c27bede71304a894c23fb3100d027fc74b':
Do all the zoneinfo.* file generation in Java.
2012-10-19 13:53:20 -07:00
Elliott Hughes
98533cfa4b
am 88cd1a21
: Merge "Upgrade to tzdata2012g."
...
* commit '88cd1a2188cde62d9f94881549791b7c197b2116':
Upgrade to tzdata2012g.
2012-10-19 13:51:19 -07:00
Elliott Hughes
f0af78c27b
am 551ca77e
: Merge "Do all the zoneinfo.* file generation in Java."
...
* commit '551ca77e35098272abfe9484457827c661d23ef0':
Do all the zoneinfo.* file generation in Java.
2012-10-19 13:51:18 -07:00
Elliott Hughes
88cd1a2188
Merge "Upgrade to tzdata2012g."
2012-10-19 13:45:55 -07:00
Elliott Hughes
c2c2a48845
Upgrade to tzdata2012g.
...
This release reflects the following changes recently circulated on the tz
mailing list:
Samoa fall 2012 and later. (Thanks to Nicholas Pereira
and Robert Elz.)
Palestine fall 2012. (Thanks to Steffen Thorsen.)
This release does not reflect the possible changes discussed yesterday
for Tocantins and Bahia.
(cherry-pick of f0e402dbd257ab495eab514b347db4b3d6844826.)
Change-Id: I8202292b11accedb811194a821dacf837a1bbd6e
2012-10-19 13:43:10 -07:00
Elliott Hughes
551ca77e35
Merge "Do all the zoneinfo.* file generation in Java."
2012-10-19 13:37:25 -07:00
Elliott Hughes
174b6d0e19
am 356c0af6
: am 2266e495
: Merge "Switch bionic over to using libcore\'s copy of libcore.util.ZoneInfo."
...
* commit '356c0af60b83988bdb55970c8f29886a2fa5a672':
Switch bionic over to using libcore's copy of libcore.util.ZoneInfo.
2012-10-19 13:22:50 -07:00
Elliott Hughes
356c0af60b
am 2266e495
: Merge "Switch bionic over to using libcore\'s copy of libcore.util.ZoneInfo."
...
* commit '2266e4956f4b245903acd66f0cc32ec5caf5abae':
Switch bionic over to using libcore's copy of libcore.util.ZoneInfo.
2012-10-19 13:18:07 -07:00
Elliott Hughes
328a484588
Do all the zoneinfo.* file generation in Java.
...
Bug: 7012465
Change-Id: Ia5d5ad75db94d680a6b34ccc26eb68d5bd2bfc29
2012-10-19 13:03:52 -07:00
Elliott Hughes
2266e4956f
Merge "Switch bionic over to using libcore's copy of libcore.util.ZoneInfo."
2012-10-19 13:01:04 -07:00
Elliott Hughes
eb06129c5c
Switch bionic over to using libcore's copy of libcore.util.ZoneInfo.
...
Bug: 7012465
Change-Id: I1225494c5d77a20fd48be1e904d8695ef95860e3
2012-10-19 12:05:24 -07:00
Elliott Hughes
a7bc708e0c
am fb8ecd6e
: am bc77942a
: am f0e402db
: Upgrade to tzdata2012g.
...
* commit 'fb8ecd6e2f20dba3b6eaf0bd6b834c2c072322c5':
Upgrade to tzdata2012g.
2012-10-19 10:02:11 -07:00
Elliott Hughes
fb8ecd6e2f
am bc77942a
: am f0e402db
: Upgrade to tzdata2012g.
...
* commit 'bc77942a9a5b2a30eb04fab495cb30ac21bb150d':
Upgrade to tzdata2012g.
2012-10-19 09:59:52 -07:00
Elliott Hughes
bc77942a9a
am f0e402db
: Upgrade to tzdata2012g.
...
* commit 'f0e402dbd257ab495eab514b347db4b3d6844826':
Upgrade to tzdata2012g.
2012-10-19 09:57:49 -07:00
Elliott Hughes
f0e402dbd2
Upgrade to tzdata2012g.
...
This release reflects the following changes recently circulated on the tz
mailing list:
Samoa fall 2012 and later. (Thanks to Nicholas Pereira
and Robert Elz.)
Palestine fall 2012. (Thanks to Steffen Thorsen.)
This release does not reflect the possible changes discussed yesterday
for Tocantins and Bahia.
Change-Id: I52d9d2cd6e8e755885dc258200c014bee75527c9
2012-10-18 16:34:48 -07:00
Elliott Hughes
0f7814264c
am 4d71adbc
: am 10225071
: Merge "Fixes x86 build."
...
* commit '4d71adbc0d12e5153f537f84cce8d9686762e5b9':
Fixes x86 build.
2012-10-18 13:58:18 -07:00
Elliott Hughes
4d71adbc0d
am 10225071
: Merge "Fixes x86 build."
...
* commit '102250719f8aff443741e54ba5633c7722544620':
Fixes x86 build.
2012-10-18 13:56:02 -07:00
Elliott Hughes
102250719f
Merge "Fixes x86 build."
2012-10-18 13:43:41 -07:00
Elliott Hughes
8b95404d00
Fixes x86 build.
...
Change-Id: I0e576784b2224668d58ebea03986d534ee0e43b4
2012-10-18 13:42:59 -07:00
Elliott Hughes
c0e8400361
am 79c6a8d2
: am ca7466d2
: Merge "Make bionic\'s dependency on the tzdata explicit."
...
* commit '79c6a8d2b163e40eb6f19bbf8f59eb85fb7996e6':
Make bionic's dependency on the tzdata explicit.
2012-10-18 13:40:19 -07:00
Elliott Hughes
79c6a8d2b1
am ca7466d2
: Merge "Make bionic\'s dependency on the tzdata explicit."
...
* commit 'ca7466d2b8ee6baad86afc82fa18cda4d931b6d3':
Make bionic's dependency on the tzdata explicit.
2012-10-18 13:37:54 -07:00
Elliott Hughes
ca7466d2b8
Merge "Make bionic's dependency on the tzdata explicit."
2012-10-18 13:19:14 -07:00
Elliott Hughes
914d8d4cff
Make bionic's dependency on the tzdata explicit.
...
Also stop building the obsolete three files, now bionic and libcore
both use the new single file.
Bug: 7012465
Change-Id: I1b9b49af7382c57b6cb8820c2275e6d4044b2bb6
2012-10-18 12:23:34 -07:00
Elliott Hughes
c63dda22dd
am 1b315363
: am 5ae762a3
: Merge "Pull bionic\'s time zone data from the new single \'tzdata\' file."
...
* commit '1b315363c22fdf53d77fc83ec0bbada32e73ccc7':
Pull bionic's time zone data from the new single 'tzdata' file.
2012-10-18 11:02:01 -07:00
Elliott Hughes
1b315363c2
am 5ae762a3
: Merge "Pull bionic\'s time zone data from the new single \'tzdata\' file."
...
* commit '5ae762a393168932602eb7269a7d30a53de1c83c':
Pull bionic's time zone data from the new single 'tzdata' file.
2012-10-18 10:59:27 -07:00
Elliott Hughes
5ae762a393
Merge "Pull bionic's time zone data from the new single 'tzdata' file."
2012-10-18 10:48:11 -07:00
Elliott Hughes
9648b588b4
am e5c8ced4
: am 9ffaabcc
: Merge "Remove obsolete CHANGES.TXT and ISSUES.TXT."
...
* commit 'e5c8ced4f95e97b2fadc0c64fbdbeeb023677035':
Remove obsolete CHANGES.TXT and ISSUES.TXT.
2012-10-18 10:28:52 -07:00
Elliott Hughes
e5c8ced4f9
am 9ffaabcc
: Merge "Remove obsolete CHANGES.TXT and ISSUES.TXT."
...
* commit '9ffaabcc49776676cb2ea60f0846f2c208f6d715':
Remove obsolete CHANGES.TXT and ISSUES.TXT.
2012-10-18 10:26:36 -07:00
Elliott Hughes
9ffaabcc49
Merge "Remove obsolete CHANGES.TXT and ISSUES.TXT."
2012-10-18 10:09:47 -07:00
Elliott Hughes
d23af23268
Pull bionic's time zone data from the new single 'tzdata' file.
...
Bug: 7012465
Change-Id: Iec71e448bf7a40af30ca89150b3c336e67a44a43
2012-10-17 16:30:47 -07:00
Elliott Hughes
f190a16e5e
am c2e4c310
: am 32ea9fe5
: Merge "Put all the tzdata in one file."
...
* commit 'c2e4c310ff9ace06be0376d649a09abb51813981':
Put all the tzdata in one file.
2012-10-17 16:12:19 -07:00
Elliott Hughes
c2e4c310ff
am 32ea9fe5
: Merge "Put all the tzdata in one file."
...
* commit '32ea9fe5783e3cc9756205c0ac46482afc700a3d':
Put all the tzdata in one file.
2012-10-17 16:09:31 -07:00
Elliott Hughes
32ea9fe578
Merge "Put all the tzdata in one file."
2012-10-17 15:52:09 -07:00