tree ff9c1959a83ea106cee93119d5e5968ce1e3e582
parent 90659cda7f173021ad05ecca8b32b934073c0509
parent a9bda02f7c931f7c4414c0cf8d64e3559c701bcd
author The Android Automerger <android-build@android.com> 1276211959 -0700
committer The Android Automerger <android-build@android.com> 1276211959 -0700

Merge branch 'froyo' into froyo-release