| Index: build/android/buildbot/bb_main_tester.sh | 
| diff --git a/build/android/buildbot/bb_main_tester.sh b/build/android/buildbot/bb_main_tester.sh | 
| index 287d28146e936f115264e4e051d1d937e8759f68..eaeec410c2920415ac2cc753dc142d27b6d66852 100755 | 
| --- a/build/android/buildbot/bb_main_tester.sh | 
| +++ b/build/android/buildbot/bb_main_tester.sh | 
| @@ -1,23 +1,8 @@ | 
| -#!/bin/bash -ex | 
| +#!/bin/bash | 
| # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| # Use of this source code is governed by a BSD-style license that can be | 
| # found in the LICENSE file. | 
| -# | 
| -# Buildbot annotator script for the main waterfall.  Tester only. | 
|  | 
| -BB_DIR="$(dirname $0)" | 
| -BB_SRC_ROOT="$(cd  "$BB_DIR/../../.."; pwd)" | 
| -. "$BB_DIR/buildbot_functions.sh" | 
| - | 
| -# SHERIFF: if you need to quickly turn the main waterfall android bots | 
| -# green (preventing tree closures), uncomment the next line (and send | 
| -# appropriate email out): | 
| -## bb_force_bot_green_and_exit | 
| - | 
| -bb_baseline_setup "$BB_SRC_ROOT" "$@" | 
| -bb_spawn_logcat_monitor_and_status | 
| -bb_extract_build | 
| -bb_reboot_phones | 
| -bb_run_unit_tests | 
| -bb_run_instrumentation_tests | 
| -bb_print_logcat | 
| +# DO NOT MODIFY. Scheduled to be removed. | 
| +# Buildbot configs will be changed to call bb_run_bot.py directly. | 
| +exec "$(dirname $0)"/bb_run_bot.py "$@" --bot-id main-tests-dbg | 
|  |