am 2b80317b: only auto-generate board= requirement if a board-info file is not specified
am 2b80317b: only auto-generate board= requirement if a board-info file is not specified

Merge commit '2b80317be27e5450d7212b10777992d782dcf90e' into eclair-plus-aosp

* commit '2b80317be27e5450d7212b10777992d782dcf90e':
  only auto-generate board= requirement if a board-info file is not specified

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