tree a27955b318d72474784ec4b91a8fd4ffbb4ac85b
parent ecf404b521e5db8d381c37a878836409b730f98f
parent 3e297b57a0cb06450034a80893b5ede223b33552
author The Android Automerger <android-build@android.com> 1274847810 -0700
committer The Android Automerger <android-build@android.com> 1274847810 -0700

Merge branch 'froyo' into froyo-release