tree b4c87cfa109baa3596d51a77016f4e5a599b15d9
parent 5d2b7e642ceda2d527cb9da0c47431d2d2ee7ddb
parent 7018d8e32761d65816c01f62b094e17e44c7ffb9
author The Android Automerger <android-build@android.com> 1271269707 -0700
committer The Android Automerger <android-build@android.com> 1271269707 -0700

Merge branch 'froyo' into froyo-release