tree 136ea23533afcc5ca47927360e3acfd5fafd75b3
parent 0841eb4584dddd73a7cacd0a318e0beccb979fc8
parent 327a9a3a309eeda5bdc18281066f2e19236455bc
author The Android Automerger <android-build@android.com> 1270479772 -0700
committer The Android Automerger <android-build@android.com> 1270479772 -0700

Merge branch 'froyo' into froyo-release