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