tree 9c83b010f556b0a0be206da318d7dc6c421ad902
parent 871319071bd804bf2f4cc65097a781147bdb1893
parent a98066d121fa98390fee71028b0ec389ad1c0c82
author Brett Chabot <brettchabot@android.com> 1255023864 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1255023864 -0700

am 32f89821: Merge change 26044 into donut-gms

Merge commit '32f8982116e5155bc3c75c86e3c861cab1a848be' into eclair

* commit '32f8982116e5155bc3c75c86e3c861cab1a848be':
  Remove tests.api.java.io.FileTest#test_delete as known failure.