tree c66cd18debea03a3daeb0664db1a6c7cffbad48a
parent 69ed23d097f8d72aecb36b1b75e89ac101c4691a
parent 2b80317be27e5450d7212b10777992d782dcf90e
author Brian Swetland <swetland@google.com> 1259188040 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1259188040 -0800

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

Merge commit '2b80317be27e5450d7212b10777992d782dcf90e' into eclair-mr2

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