Merge "Fix lunch choices w/zsh"
diff --git a/envsetup.sh b/envsetup.sh
index f91b820..db86d92 100644
--- a/envsetup.sh
+++ b/envsetup.sh
@@ -580,7 +580,7 @@
 
     local i=1
     local choice
-    for choice in $choices
+    for choice in $(echo $choices)
     do
         echo "     $i. $choice"
         i=$(($i+1))