tree 5ce7a8cf65224a7139b03caf438a7409f45add21
parent 962698c56902c588d4debe2a986e5995a7a7dbd6
parent f7bd7ee84d6588b43758909706969f432994825f
author The Android Automerger <android-build@android.com> 1274134741 -0700
committer The Android Automerger <android-build@android.com> 1274134741 -0700

Merge branch 'froyo' into froyo-release