am f8a7ff19: resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp
am f8a7ff19: resolved conflicts for merge of 123995f9 to honeycomb-plus-aosp

* commit 'f8a7ff191af760ee01e5c31f154f0dbc7abfef7e':
  Dist build.prop in sdk builds.

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