| commit | af97a512190c493179f27bd08fc400905d598042 | [log] [tgz] |
|---|---|---|
| author | The Android Automerger <android-build@android.com> | Thu Dec 16 07:39:00 2010 -0800 |
| committer | The Android Automerger <android-build@android.com> | Thu Dec 16 07:39:00 2010 -0800 |
| tree | 4b825dc642cb6eb9a060e54bf8d69288fbee4904 | |
| parent | 6f8e6d4a5fe5a73c431b2ac60ef46748745ed5d7 [diff] | |
| parent | b8636f01c59c7edc68853c59a66be62ba3f62565 [diff] |
Merge branch 'master' into honeycomb-release * master: More work arounds for the droiddoc bug where @links cannot point to parameterized methods. Fix a long-standing serialization bug. Fix a regression I introduced in serialization. Work around droiddoc bug where @links cannot point to parameterized methods. Fix java.util.concurrent to not @link to unpublished APIs. Use iteration rather than recursion in writeHierarchy. Recover from the 'null' system class loader gracefully. Plumbing for loading byte[]-based dex files. Speed up serialization. Update java.util.concurrent to the latest.
This tree is empty.