diff options
| author | Baligh Uddin <baligh@google.com> | 2013-09-25 02:31:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-09-25 02:31:37 +0000 |
| commit | e4dda1f1e9b5f708885789493425052666772d48 (patch) | |
| tree | 6ab7b9b1a1b2d4af39654af34ca092c052aea08a | |
| parent | 738370d9387396922c10910edb61272e585be107 (diff) | |
| parent | 5a6f55a3c46b2a265335afb5d9e15402a9ef4d9b (diff) | |
| download | bionic-jb-mr2-dev.tar.gz | |
Merge "resolved conflicts for merge of 5d0ad38c to jb-mr2-dev" into jb-mr2-devjb-mr2-dev
| -rw-r--r-- | libc/zoneinfo/tzdata | bin | 568097 -> 567299 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/libc/zoneinfo/tzdata b/libc/zoneinfo/tzdata Binary files differindex 959428411..bce6e5002 100644 --- a/libc/zoneinfo/tzdata +++ b/libc/zoneinfo/tzdata |