aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-03-02 11:10:43 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-03-02 11:10:43 -0800
commit6d074bb71a316f73f35f4430a71fa706c46d4b75 (patch)
treed1e0ba4d3a8d51932411ddd56e3dc4349746e88d
parenta2b1bbc9a605819eb5ecd1df61d4f2a79f1a8f92 (diff)
parent70d1d45f0ecaee262627a6ca323fc2b4fe3e9024 (diff)
downloadandroid_bionic-6d074bb71a316f73f35f4430a71fa706c46d4b75.tar.gz
android_bionic-6d074bb71a316f73f35f4430a71fa706c46d4b75.tar.bz2
android_bionic-6d074bb71a316f73f35f4430a71fa706c46d4b75.zip
am 70d1d45f: am a58c88c2: Merge "Upgrade to tzdata2012b."
* commit '70d1d45f0ecaee262627a6ca323fc2b4fe3e9024': 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