| commit | ca2c6f75a87b7ff5578dff531481e1af540b43cc | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Sep 13 10:56:39 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 13 10:56:39 2013 -0700 |
| tree | 451e9124eaa3e90a788b6ad53226fda9c437ab20 | |
| parent | 7915b22e8f70b80a9fc2c41f9734194c58b546fc [diff] | |
| parent | 592c07084bf0d86b42e216002e5aaabf40023ea8 [diff] |
am 592c0708: am b30f6eb0: am 9e6104d5: resolved conflicts for merge of 05292dd6 to jb-mr1-dev * commit '592c07084bf0d86b42e216002e5aaabf40023ea8': 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