| commit | b30f6eb026db05c969afacc758e529e73f0e314d | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Sep 13 10:51:31 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 13 10:51:31 2013 -0700 |
| tree | c63300f993ca13a4bd39c8224c76fb10ff27e240 | |
| parent | b8e1033c5b5813cb97d19645075591a357e9f04a [diff] | |
| parent | 9e6104d54f541d43d3c1b785f2dfc1d2e09c0f2f [diff] |
am 9e6104d5: resolved conflicts for merge of 05292dd6 to jb-mr1-dev * commit '9e6104d54f541d43d3c1b785f2dfc1d2e09c0f2f': Upgrade pre-jb-mr2 releases to tzdata2013d.
diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat index cb0507a..97b79b8 100644 --- a/libc/zoneinfo/zoneinfo.dat +++ b/libc/zoneinfo/zoneinfo.dat Binary files differ
diff --git a/libc/zoneinfo/zoneinfo.idx b/libc/zoneinfo/zoneinfo.idx index c93b637..b702132 100644 --- a/libc/zoneinfo/zoneinfo.idx +++ b/libc/zoneinfo/zoneinfo.idx Binary files differ
diff --git a/libc/zoneinfo/zoneinfo.version b/libc/zoneinfo/zoneinfo.version index 73bb417..278f45d 100644 --- a/libc/zoneinfo/zoneinfo.version +++ b/libc/zoneinfo/zoneinfo.version
@@ -1 +1 @@ -2012h +2013d