aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-03-02 11:13:05 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-03-02 11:13:05 -0800
commit079989259f257a29bb0734ed968d80a1e35c494f (patch)
tree70e376f699f4a354dd7135601d6b489af99665e0
parentda16ad11fe83d41d43bcf30b3aad01aafa8f5bc6 (diff)
parent6d074bb71a316f73f35f4430a71fa706c46d4b75 (diff)
downloadandroid_bionic-079989259f257a29bb0734ed968d80a1e35c494f.tar.gz
android_bionic-079989259f257a29bb0734ed968d80a1e35c494f.tar.bz2
android_bionic-079989259f257a29bb0734ed968d80a1e35c494f.zip
am 6d074bb7: am 70d1d45f: am a58c88c2: Merge "Upgrade to tzdata2012b."
* commit '6d074bb71a316f73f35f4430a71fa706c46d4b75': Upgrade to tzdata2012b.
-rw-r--r--libc/zoneinfo/zoneinfo.datbin483487 -> 483487 bytes
-rw-r--r--libc/zoneinfo/zoneinfo.version2
2 files changed, 1 insertions, 1 deletions
diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat
index bbea289b3..2e53be08b 100644
--- a/libc/zoneinfo/zoneinfo.dat
+++ b/libc/zoneinfo/zoneinfo.dat
Binary files differ
diff --git a/libc/zoneinfo/zoneinfo.version b/libc/zoneinfo/zoneinfo.version
index 86d4eb78e..10d350a00 100644
--- a/libc/zoneinfo/zoneinfo.version
+++ b/libc/zoneinfo/zoneinfo.version
@@ -1 +1 @@
-2012a
+2012b