tree e4a39c52dc17424c400c4a56e69f301b5263d707
parent 059fe0c70e054af8703daa92330e8c59505aa8b5
parent 843e860e8ebab96ff70988f2829fac38afd9d937
author The Android Automerger <android-build@android.com> 1275973493 -0700
committer The Android Automerger <android-build@android.com> 1275973493 -0700

Merge branch 'froyo' into froyo-release