resolved conflicts for merge of 0f8fcbe2 to gingerbread
resolved conflicts for merge of 0f8fcbe2 to gingerbread

Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019

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