tree 20cbbd198c92e15d617987881764356f98a81111
parent 49c9760c3e0a15b29fa8bc621c7b2e485764589f
parent d65d08e709ec0916446100bae0a7276d0800382f
author The Android Automerger <android-build@android.com> 1271872003 -0700
committer The Android Automerger <android-build@android.com> 1271872003 -0700

Merge branch 'froyo' into froyo-release