tree dc7a2376d1b713062dfe2e22081241f7ed455b70
parent 9b45c6ce2c2588fd2c51ae6c045f536818b01a2c
parent 68c92f3410991182d6a93744c87180be65b9c82b
author The Android Automerger <android-build@android.com> 1276211958 -0700
committer The Android Automerger <android-build@android.com> 1276211958 -0700

Merge branch 'froyo' into froyo-release