| commit | 5ba74660e3f0f9478dcb8ca6ee2ce53ceda6d926 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Fri Oct 19 15:45:58 2012 -0700 |
| committer | The Android Automerger <android-build@android.com> | Fri Oct 19 15:45:58 2012 -0700 |
| tree | 531992a2ffbd7483d994cf8831fb789979f97323 | |
| parent | f0e402dbd257ab495eab514b347db4b3d6844826 [diff] | |
| parent | 7cc2dec82e6b85c4a81cffab236f984dd26d35e2 [diff] |
merge in jb-mr1-release history after reset to jb-mr1-dev
diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat index 4631c2c..a3db773 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 0e3b394..2459c39 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 18a0c39..5d556a3 100644 --- a/libc/zoneinfo/zoneinfo.version +++ b/libc/zoneinfo/zoneinfo.version
@@ -1 +1 @@ -2012f +2012g