tree 5edc07d1ac493d27b0346928be18d605dc1df186
parent e94e6956a2530e60dde4eb618277a5bcce61f6da
parent dca661236c73ecd819cfea964c6f8170e5cc40ae
author The Android Automerger <android-build@android.com> 1271344353 -0700
committer The Android Automerger <android-build@android.com> 1271344353 -0700

Merge branch 'froyo' into froyo-release