merge from froyo-plus-aosp

Change-Id: Iad8617b45d406e7f737bf68ed723755363d27e9b
This commit is contained in:
Jean-Baptiste Queru 2010-06-09 16:09:19 -07:00
commit 1a62198e28

Diff Content Not Available