am 6069db77: merge from open-source master

Merge commit '6069db77bbd93bdf2a4635a8a7d2ccfb90f0fa75'

* commit '6069db77bbd93bdf2a4635a8a7d2ccfb90f0fa75':
  Add full-eng instead of generic-eng in the lunch menu
diff --git a/envsetup.sh b/envsetup.sh
index efe65b9..9d2c1b8 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -432,7 +432,7 @@
 }
 
 # 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