merge from froyo-plus-aosp - DO NOT MERGE
merge from froyo-plus-aosp - DO NOT MERGE

Change-Id: I5ddea1d56218732cf5cba16e0c8db18399b7f504

xorware/android_build,Hybrid-Power/startsync,pranav01/platform_manifest,fallouttester/platform_manifest,xorware/android_build,xorware/android_build,xorware/android_build,see4ri/lolili,RR-msm7x30/platform_manifest,hagar006/platform_manifest,knone1/platform_manifest,ND-3500/platform_manifest,xorware/android_build