merge from froyo-plus-aosp

Change-Id: I1a3c106234a7910194fe39ca17339796aaf5cfe1
This commit is contained in:
The Android Open Source Project 2010-06-25 09:58:37 -07:00
commit 0e5a6b126e

Diff Content Not Available