tree f5c83158f4304b513f748cbbaf2604c829eb0c22
parent ff6685e39bfca52a9f14432203ff35d2bf20427a
parent 87d2ca8a66f1b1ed3693461c93ba2569c564529f
author The Android Automerger <android-build@android.com> 1271978200 -0700
committer The Android Automerger <android-build@android.com> 1271978200 -0700

Merge branch 'froyo' into froyo-release