tree 90157df8bfe2939faf66060b41c751c88e613266
parent fad128b1e21fd8fb706f05a0ea616cddcb734df3
parent 95767e3808ce975ca64d408fd45a4f0625e51ced
author The Android Automerger <android-build@android.com> 1272048899 -0700
committer The Android Automerger <android-build@android.com> 1272048899 -0700

Merge branch 'froyo' into froyo-release