| commit | 3d11bf0f3f3cf848f6f1e8449bf8736d8d1c78a3 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Wed Jan 18 21:16:26 2012 -0800 |
| committer | The Android Automerger <android-build@android.com> | Wed Jan 18 21:16:26 2012 -0800 |
| tree | 7672e9c24da57867c389a5129e59934b3197f6a8 | |
| parent | e8e1efeafb8754ea8358e78cfe3d0f7ad4e809b2 [diff] | |
| parent | 43828aa3a76381cdc7f6f78baff5f1cc7011958b [diff] |
merge in ics-mr1-release history after reset to ics-mr1
diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat index e41422e..49b99ec 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 eb02e80..c9eefc6 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 6140b76..c4f4922 100644 --- a/libc/zoneinfo/zoneinfo.version +++ b/libc/zoneinfo/zoneinfo.version
@@ -1 +1 @@ -2011l +2011n