merge from froyo-plus-aosp

Change-Id: Ibbc09c6cacf9d0f06ff88eec0fcf3a245e2e2535
This commit is contained in:
Jean-Baptiste Queru 2010-06-09 16:21:55 -07:00
commit e70f4e74c8

Diff Content Not Available