diff options
| author | Elliott Hughes <enh@google.com> | 2013-09-13 11:16:11 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-09-13 11:16:11 -0700 |
| commit | d3f9e8155bfc17b2d67d2ffe5bc1d3a5e2656cd4 (patch) | |
| tree | 6ab7b9b1a1b2d4af39654af34ca092c052aea08a | |
| parent | 738370d9387396922c10910edb61272e585be107 (diff) | |
| parent | 5d0ad38c72951ef180742efb27933ecd6e9d9593 (diff) | |
| download | bionic-d3f9e8155bfc17b2d67d2ffe5bc1d3a5e2656cd4.tar.gz | |
resolved conflicts for merge of 5d0ad38c to jb-mr2-devjb-mr2-cts-dev
Change-Id: I606f6d86aad46c5eda0dc0d907fe691ca0eea826
| -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 |