tree 543d703fff29a55a748782ca3d0b945090915604
parent 2d3faf4f6c87fad64c7bf7d50e37156fa21f5c41
parent 993d2efb7406675dbb1882cd287dc972366d5251
author The Android Automerger <android-build@android.com> 1272482471 -0700
committer The Android Automerger <android-build@android.com> 1272482471 -0700

Merge branch 'froyo' into froyo-release