summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-04-18 11:10:56 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-04-18 17:21:05 -0700
commitb24ae583cdac038d4258cd7a8a0d75304b4fa134 (patch)
treec10b8f5f57f0508876a33329e6ab5c5e576a5ae4
parent98ea0860a43eb4d830f44062fd1130a68f8fc59c (diff)
parent12123dffb829086ebb1b07d81ef01522519ed657 (diff)
downloadbionic-b24ae583cdac038d4258cd7a8a0d75304b4fa134.zip
bionic-b24ae583cdac038d4258cd7a8a0d75304b4fa134.tar.gz
bionic-b24ae583cdac038d4258cd7a8a0d75304b4fa134.tar.bz2
Merge tag 'android-6.0.1_r30' into HEAD
Ticket: RM-234 Android 6.0.1 release 30 Change-Id: I67a692b84fdc2e0ecbe83870ea3520a746130742
-rw-r--r--libc/zoneinfo/tzdatabin494261 -> 491711 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/libc/zoneinfo/tzdata b/libc/zoneinfo/tzdata
index c464f46..d2cc535 100644
--- a/libc/zoneinfo/tzdata
+++ b/libc/zoneinfo/tzdata
Binary files differ