diff options
| author | Elliott Hughes <enh@google.com> | 2013-09-13 10:56:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-13 10:56:39 -0700 |
| commit | ca2c6f75a87b7ff5578dff531481e1af540b43cc (patch) | |
| tree | 451e9124eaa3e90a788b6ad53226fda9c437ab20 | |
| parent | 7915b22e8f70b80a9fc2c41f9734194c58b546fc (diff) | |
| parent | 592c07084bf0d86b42e216002e5aaabf40023ea8 (diff) | |
| download | bionic-ca2c6f75a87b7ff5578dff531481e1af540b43cc.tar.gz | |
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.
| -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 |