am f47b0a17: merge from open-source master

Merge commit 'f47b0a1758a66277d11f362e307f0dd6c183051d'

* commit 'f47b0a1758a66277d11f362e307f0dd6c183051d':
  Add generic_x86-eng to the lunch menu
This commit is contained in:
The Android Open Source Project 2010-07-12 15:06:02 -07:00 committed by Android Git Automerger
commit f508e251ec

View file

@ -433,6 +433,7 @@ function add_lunch_combo()
# add the default one here
add_lunch_combo full-eng
add_lunch_combo generic_x86-eng
# if we're on linux, add the simulator. There is a special case
# in lunch to deal with the simulator