tree a677de7a6a3ae334877f9db19e974df070bf0966
parent 44ce293c66aea10a0efa5874c3779ff8a50aa080
parent cbe7f20ad7d042bdad893aca9295a4b00aef7f54
author The Android Automerger <android-build@android.com> 1271706625 -0700
committer The Android Automerger <android-build@android.com> 1271706625 -0700

Merge branch 'froyo' into froyo-release