tree 23db1581b0f509bcc86c55508da7169f72b4878f
parent 6f2dbc2ffb3ae803eae6c83f6036074ede29841a
parent 1896a6ec2d537aaf2996018e04f4f746bd1071d6
author The Android Automerger <android-build@android.com> 1272899412 -0700
committer The Android Automerger <android-build@android.com> 1272899412 -0700

Merge branch 'froyo' into froyo-release