am aed937ba: am 3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo
am aed937ba: am 3ca0e96a: Merge "Fixed a bunch of stuff in the prelink mappings file:" into froyo

Merge commit 'aed937ba46e4137ad5a5d047a438f48c4c81e46b' into kraken

* commit 'aed937ba46e4137ad5a5d047a438f48c4c81e46b':
  Fixed a bunch of stuff in the prelink mappings file:

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