merge from open-source master

Change-Id: I412376856ebbcec786181c7a9d3b4af4ef52c7a6
This commit is contained in:
The Android Open Source Project 2010-07-12 14:46:37 -07:00
commit 93c63d5740
1 changed files with 1 additions and 1 deletions

View File

@ -1091,7 +1091,7 @@ case `ps -o command -p $$` in
esac
# Execute the contents of any vendorsetup.sh files we can find.
for f in `/bin/ls vendor/*/vendorsetup.sh vendor/*/build/vendorsetup.sh device/*/*/vendorsetup.sh 2> /dev/null`
for f in `/bin/ls vendor/*/vendorsetup.sh vendor/*/*/vendorsetup.sh device/*/*/vendorsetup.sh 2> /dev/null`
do
echo "including $f"
. $f