Merge "Remove simulator from the lunch menu"

add_lunch_combo full_x86-eng

add_lunch_combo vbox_x86-eng

# if we're on linux, add the simulator.  There is a special case

# in lunch to deal with the simulator

if [ "$(uname)" = "Linux" ] ; then

    add_lunch_combo simulator

fi

function print_lunch_menu()

{

    local uname=$(uname)