tree 8ba0562e5dd9d24d457f338ec28ef7b875096b14
parent 10405dd6e51195a8ec0e081572068b86df37ec6a
parent 8802e960495e61803c18ea3dda2e30ef0a611d8f
author The Android Automerger <android-build@android.com> 1274991688 -0700
committer The Android Automerger <android-build@android.com> 1274991688 -0700

Merge branch 'froyo' into froyo-release