| commit | f29c214d6ad97f9a5348407cc66a58aec2228ca9 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Wed Oct 31 03:11:57 2012 |
| committer | The Android Automerger <android-build@android.com> | Wed Oct 31 03:11:57 2012 |
| tree | 34349145ea386f6b6b743c383d7aa9e7f68bd146 | |
| parent | a811d7a8e638ca49aee704c613cb9f1e03c3698d [diff] | |
| parent | 5ba74660e3f0f9478dcb8ca6ee2ce53ceda6d926 [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 a3db773..cb0507a 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 2459c39..c93b637 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 5d556a3..73bb417 100644 --- a/libc/zoneinfo/zoneinfo.version +++ b/libc/zoneinfo/zoneinfo.version
@@ -1 +1 @@ -2012g +2012h