Commit 9cef2c8a authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'master' into honeycomb-release 

* master:
  Remove the external allocation facility.
  Tests to cover Socket's surprising behavior on read after close
  We always wantDex at this point.
parents b656db42 56c3620a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment