resolved conflicts for merge of 54ddcc27 to gingerbread-plus-aosp
resolved conflicts for merge of 54ddcc27 to gingerbread-plus-aosp

Change-Id: I336f9e6859dce3bb18224b3340837474319c809c

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