summaryrefslogtreecommitdiffstats
path: root/libc
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-04-02 16:09:36 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-02 16:09:36 -0700
commit1302f6936bf85199318bee9846d4e2be83c2489a (patch)
treebef9bbcc8c412927e30b4dd55323362ce886e939 /libc
parent4e362f230b36596650feaa305bdf5f6af7b634f8 (diff)
parentfdb119297ac421e2fc2ec096a6d5370b81938de8 (diff)
downloadbionic-1302f6936bf85199318bee9846d4e2be83c2489a.zip
bionic-1302f6936bf85199318bee9846d4e2be83c2489a.tar.gz
bionic-1302f6936bf85199318bee9846d4e2be83c2489a.tar.bz2
am fdb11929: am b88f810d: Merge "Update to tzdata2012c."
* commit 'fdb119297ac421e2fc2ec096a6d5370b81938de8': Update to tzdata2012c.
Diffstat (limited to 'libc')
-rw-r--r--libc/zoneinfo/zoneinfo.datbin483487 -> 484319 bytes
-rw-r--r--libc/zoneinfo/zoneinfo.idxbin29952 -> 29952 bytes
-rw-r--r--libc/zoneinfo/zoneinfo.version2
3 files changed, 1 insertions, 1 deletions
diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat
index 2e53be0..cc1cb38 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 c888563..0483c28 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 10d350a..9412b94 100644
--- a/libc/zoneinfo/zoneinfo.version
+++ b/libc/zoneinfo/zoneinfo.version
@@ -1 +1 @@
-2012b
+2012c