merge from open-source master

Change-Id: I9363020bdd32d8ff984a3945a2aab6245cf7a3c4
2010-07-12 14:58:14 -07:00
parent 87f500004a 6f9318e035
commit f47b0a1758
1 changed files with 1 additions and 0 deletions
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -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