diff options
| author | Baligh Uddin <baligh@google.com> | 2013-09-25 02:31:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-09-25 02:31:09 +0000 |
| commit | f7a9a681abfc9de1abb44e5973cab24889d91ad0 (patch) | |
| tree | 78b8305d2601b0dd6ca016ee64a650f20a85f01d | |
| parent | e5412a9a9597433ae2540b390269c514c46402f1 (diff) | |
| parent | 1d69ab1de934e7d8487bf903204976b9d9b33143 (diff) | |
| download | bionic-jb-mr1-dev.tar.gz | |
Merge "resolved conflicts for merge of 05292dd6 to jb-mr1-dev" into jb-mr1-devjb-mr1-dev
| -rw-r--r-- | libc/zoneinfo/zoneinfo.dat | bin | 499422 -> 518429 bytes | |||
| -rw-r--r-- | libc/zoneinfo/zoneinfo.idx | bin | 29848 -> 30108 bytes | |||
| -rw-r--r-- | libc/zoneinfo/zoneinfo.version | 2 |
3 files changed, 1 insertions, 1 deletions
diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat Binary files differindex cb0507a41..97b79b805 100644 --- a/libc/zoneinfo/zoneinfo.dat +++ b/libc/zoneinfo/zoneinfo.dat diff --git a/libc/zoneinfo/zoneinfo.idx b/libc/zoneinfo/zoneinfo.idx Binary files differindex c93b63797..b70213292 100644 --- a/libc/zoneinfo/zoneinfo.idx +++ b/libc/zoneinfo/zoneinfo.idx diff --git a/libc/zoneinfo/zoneinfo.version b/libc/zoneinfo/zoneinfo.version index 73bb41781..278f45d67 100644 --- a/libc/zoneinfo/zoneinfo.version +++ b/libc/zoneinfo/zoneinfo.version @@ -1 +1 @@ -2012h +2013d |