tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent af97a512190c493179f27bd08fc400905d598042
parent 554f44a3a3148439d2410dfa9664104eb69408fb
author The Android Automerger <android-build@android.com> 1292622290 -0800
committer The Android Automerger <android-build@android.com> 1292622290 -0800

Merge branch 'master' into honeycomb-release

* master:
  Test that HttpURLConnection responds gracefully when the server closes a socket.
  Use ftruncate64.
  Fix File.length for sparse files.
  Fix the XML declaration message to work with JUnit 3.8.1 or JUnit 4.
  Don't be specific about exception priority in OldFileChannelTest.
  More math tests that fail on the host only.
  Don't test for implementation details in OldRandomAccessFileTest.
  HttpsURLConnection retry should not invoke X509TrustManager and HostnameVerifier more than once
  Don't bother trying to unzip a file named "*.dex".
  MappedByteBuffer get(byte[]) and get(byte[], int, int) weren't updating 'position'.