am 26542574: am 8feaa2b6: am d0b22902: Merge change I847e8ab8 into eclair
am 26542574: am 8feaa2b6: am d0b22902: Merge change I847e8ab8 into eclair

Merge commit '265425746b50ddb14467b2bdbd62f3424b7176f0'

* commit '265425746b50ddb14467b2bdbd62f3424b7176f0':
  Fix issue #2258571: Fix build versions

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