diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-07-02 07:33:39 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-02 07:33:39 -0700 |
commit | cb8eedc5c420121457d6d5d657097f41ad88a0d6 (patch) | |
tree | 745f5ce2a80fb5a0e68aa9fb714100ee8121ff7d /envsetup.sh | |
parent | ba9d0beb97c9abeb7aefcdec7e0154a5d4ae3d70 (diff) | |
parent | 6069db77bbd93bdf2a4635a8a7d2ccfb90f0fa75 (diff) | |
download | build-cb8eedc5c420121457d6d5d657097f41ad88a0d6.zip build-cb8eedc5c420121457d6d5d657097f41ad88a0d6.tar.gz build-cb8eedc5c420121457d6d5d657097f41ad88a0d6.tar.bz2 |
am 6069db77: merge from open-source master
Merge commit '6069db77bbd93bdf2a4635a8a7d2ccfb90f0fa75'
* commit '6069db77bbd93bdf2a4635a8a7d2ccfb90f0fa75':
Add full-eng instead of generic-eng in the lunch menu
Diffstat (limited to 'envsetup.sh')
-rw-r--r-- | envsetup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/envsetup.sh b/envsetup.sh index efe65b9..9d2c1b8 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -432,7 +432,7 @@ function add_lunch_combo() } # 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 |