tree 67fd5cd158c462fe1d4cbd652d2fecedc7b6d018
parent dd4aaa72508c87259f597cc136fb9f314d3cd2f5
parent 55dcedfcc33658d14c04b4a1bced05c783becc2a
author The Android Automerger <android-build@android.com> 1271090732 -0700
committer The Android Automerger <android-build@android.com> 1271090732 -0700

Merge branch 'froyo' into froyo-release