aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2011-11-16 10:47:37 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-16 10:47:37 -0800
commit2c222c49066e46208ea5ed75141978a5c3974d10 (patch)
tree15cfb339f4d810a502ac8a32bf66517f29a96c29
parent30983c9ab9a14701e3b2250d066ff748d7345453 (diff)
parentf0e5b680ba9be42deab3ac0b375a0bbe78d3fba7 (diff)
downloadbionic-gingerbread.tar.gz
Merge "Update to tzdata2011n." into gingerbreadandroid-cts-2.3_r12android-cts-2.3_r11android-cts-2.3_r10gingerbread
-rw-r--r--libc/zoneinfo/zoneinfo.datbin503608 -> 484401 bytes
-rw-r--r--libc/zoneinfo/zoneinfo.idxbin29536 -> 29900 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 27ca5d0c6..49b99ecd3 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 09bd15fab..c9eefc64f 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 76dcafb8e..c4f49224b 100644
--- a/libc/zoneinfo/zoneinfo.version
+++ b/libc/zoneinfo/zoneinfo.version
@@ -1 +1 @@
-2010k
+2011n