Merge "Avoid complaining about empty directories"

envsetup.sh

@@ -197,7 +197,7 @@ function addcompletions()
 
     dir="sdk/bash_completion"
     if [ -d ${dir} ]; then
-        for f in ${dir}/[a-z]*.bash; do
+        for f in `/bin/ls ${dir}/[a-z]*.bash 2> /dev/null`; do
             echo "including $f"
             . $f
         done