tree 4883800011cc951c2967bd3f3fc59aca52756cf5
parent e88fcadb066bbf555d5341d813b793afbdb2394e
parent 9d179ade1acabead93b7b96d92709d2c5b8bbc04
author The Android Automerger <android-build@android.com> 1272573257 -0700
committer The Android Automerger <android-build@android.com> 1272573257 -0700

Merge branch 'froyo' into froyo-release