tree 1427d2468c5222bea6705840e3d91018b32ffce3
parent 55c337bda1d866a036a4c2b05f6c40efb26eabbc
parent f984e853f253c76a7a636a094680bb01c4b8ffb8
author The Android Automerger <android-build@android.com> 1269879921 -0700
committer The Android Automerger <android-build@android.com> 1269879921 -0700

Merge branch 'froyo' into froyo-release