resolved conflicts for merge of 882ad42e to eclair-mr2
resolved conflicts for merge of 882ad42e to eclair-mr2

Change-Id: I3d14fd9f6bb2b6f3878e519b29db113c37d64587

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