tree a9876e9cad876cf8a91b7983dcb9f0321e0f1bcf
parent 8397449e0157865b2941114b3af58dbce628b28f
parent f3d5ea926d4dd1a739b9d3816543728af723cc26
author The Android Automerger <android-build@android.com> 1274237166 -0700
committer The Android Automerger <android-build@android.com> 1274237166 -0700

Merge branch 'froyo' into froyo-release