am dca7c008: merge from froyo-plus-aosp

Merge commit 'dca7c0080e82fd7a29e6eebbba507122d73a9d32'

* commit 'dca7c0080e82fd7a29e6eebbba507122d73a9d32':
This commit is contained in:
The Android Open Source Project 2010-06-14 11:59:15 -07:00 committed by Android Git Automerger
commit 4632e2dd99

Diff content is not available