| commit | 485fc9f4ef2f834a92ef1545e39f30ac2b3e0ebb | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Tue Apr 03 03:27:58 2012 -0700 |
| committer | The Android Automerger <android-build@android.com> | Tue Apr 03 03:27:58 2012 -0700 |
| tree | bef9bbcc8c412927e30b4dd55323362ce886e939 | |
| parent | 1302f6936bf85199318bee9846d4e2be83c2489a [diff] | |
| parent | b955ffa5b352e45aefc54dedb2e7a3b578b687c8 [diff] |
merge in jb-release history after reset to master
diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat index 2e53be0..cc1cb38 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 c888563..0483c28 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 10d350a..9412b94 100644 --- a/libc/zoneinfo/zoneinfo.version +++ b/libc/zoneinfo/zoneinfo.version
@@ -1 +1 @@ -2012b +2012c