| commit | 918ad3ecfd5bd94f284a953253bb488cd20e5f66 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Tue Aug 30 13:42:36 2011 -0700 |
| committer | The Android Automerger <android-build@android.com> | Tue Aug 30 13:42:36 2011 -0700 |
| tree | 7e5a90cad5a6511a5261de19ffbba8f4d977a2e6 | |
| parent | 38bccb271f121fc06eaa0d8fbd3c982bc44c36b7 [diff] | |
| parent | fd3fc8bd271c657e25b83e2d0349eb51dd12428d [diff] |
merge in ics-release history after reset to master
diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat index bac23f0..2bfe294 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 7750e4d..60fe3be 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 4abe0cc..a3020ca 100644 --- a/libc/zoneinfo/zoneinfo.version +++ b/libc/zoneinfo/zoneinfo.version
@@ -1 +1 @@ -2011h +2011i
diff --git a/linker/linker.h b/linker/linker.h index 301d268..8a5bc45 100644 --- a/linker/linker.h +++ b/linker/linker.h
@@ -95,6 +95,8 @@ unsigned base; unsigned size; + int unused; // DO NOT USE, maintained for compatibility. + unsigned *dynamic; unsigned wrprotect_start;