tree acc18ae1c24cc811fcf6c1085e1147aef0cab022
parent d10c87bcd27605bf3f4677bdbcdb0b5cbd3ce9e3
parent 774b327991dc9e1c140d929c32c87dff36695bfc
author The Android Automerger <android-build@android.com> 1276045063 -0700
committer The Android Automerger <android-build@android.com> 1276045063 -0700

Merge branch 'froyo' into froyo-release