merge from open-source master

Change-Id: Ib0c0f02bb8fc87c3221fd9d2387a46b579a8ce40
2010-07-16 13:03:44 -07:00
parent c8ae417bdc 6c2df3e98b
commit fa2d8ace56
3 changed files with 36 additions and 1 deletions
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -433,7 +433,7 @@ function add_lunch_combo()

 # add the default one here
 add_lunch_combo full-eng
-add_lunch_combo generic_x86-eng
+add_lunch_combo full_x86-eng

 # if we're on linux, add the simulator.  There is a special case
 # in lunch to deal with the simulator