| commit | c90290899956a3e711fd3789a5f8169f4661a558 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Tue Sep 27 06:59:11 2011 -0700 |
| committer | The Android Automerger <android-build@android.com> | Tue Sep 27 06:59:11 2011 -0700 |
| tree | 557f79f3244d9115ae8ec8756d08f4442baa733f | |
| parent | 00964912745f0bb7e081f84ddcc74940f973149f [diff] | |
| parent | 0c7245213d10c50e0ca49e4e8f279872c4b9877f [diff] |
merge in ics-release history after reset to master
diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat index fa62ccd..43d825d 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 be30d99..0a7f343 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 cb7f5bd..1023136 100644 --- a/libc/zoneinfo/zoneinfo.version +++ b/libc/zoneinfo/zoneinfo.version
@@ -1 +1 @@ -2011j +2011k