tree 729c091904b9f53b26108144247997e5130fa023
parent 98f0612b22111dd9e2d23b171b9059582cc44991
parent 32f8982116e5155bc3c75c86e3c861cab1a848be
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.