merge from open-source master

Change-Id: I8ff445963424ee9520f5de46f6ca8d2c3313c819
This commit is contained in:
The Android Open Source Project 2010-07-02 07:31:36 -07:00
commit 6069db77bb

View file

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