tree 2f77a6d8464be07d5707cebb921fc4955b9712da
parent df4426c4a8522abce43038ac555b326707e980a0
parent 3af600182f200b52ac93897061efb4896dd3ea8e
author The Android Automerger <android-build@android.com> 1270566452 -0700
committer The Android Automerger <android-build@android.com> 1270566452 -0700

Merge branch 'froyo' into froyo-release