Merge branch 'master' of ssh://chromiumos-git/chromeos

This commit is contained in:
David McMahon 2009-12-08 16:31:30 -08:00
commit 86694aa35e

View File

@ -29,7 +29,7 @@ PLATFORM_DIR="$SRC_ROOT/platform"
PLATFORM_DIRS="acpi assets fake_hal init installer login_manager \ PLATFORM_DIRS="acpi assets fake_hal init installer login_manager \
memento_softwareupdate pam_google window_manager \ memento_softwareupdate pam_google window_manager \
cros chrome screenlocker cryptohome \ cros chrome screenlocker cryptohome \
monitor_reconfig minijail" monitor_reconfig minijail metrics_collection"
THIRD_PARTY_DIR="$SRC_ROOT/third_party" THIRD_PARTY_DIR="$SRC_ROOT/third_party"
THIRD_PARTY_PACKAGES="connman e2fsprogs/files gflags gtest \ THIRD_PARTY_PACKAGES="connman e2fsprogs/files gflags gtest \