tree a4a83d61dc4619b61478f26c74294c4210d57dae
parent 4a4c729a5bd110442abe69ba3c13235b28fc129f
parent 6ad7942740b95adfac0e274c3bdbf54925403dd7
author The Android Automerger <android-build@android.com> 1272307490 -0700
committer The Android Automerger <android-build@android.com> 1272307490 -0700

Merge branch 'froyo' into froyo-release