tree c59b7b82f3d94632af7c0c3205a273422aff5302
parent 8d74cc034c281ae7ef0c0c8c0c0e2a8974d151f7
parent ab66ed2e067cbd1bc415b6cf66f3b5191b166461
author The Android Automerger <android-build@android.com> 1276282030 -0700
committer The Android Automerger <android-build@android.com> 1276282030 -0700

Merge branch 'froyo' into froyo-release