tree 524a3a198b03a469813cebc31eb775aaef656de8
parent 9d31c9d39a9a425e004dd83040249c6d63d9bad9
parent 36354e4e73171f7ad0f92d8eefa389d8824eae36
author The Android Automerger <android-build@android.com> 1276031341 -0700
committer The Android Automerger <android-build@android.com> 1276031341 -0700

Merge branch 'froyo' into froyo-release