Commit af97a512 authored by The Android Automerger's avatar The Android Automerger
Browse files

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.
parents 6f8e6d4a b8636f01
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment