Kill adb server each buildbot run

build/android/buildbot/buildbot_functions.sh

 #!/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.
 #
 # Bash functions used by buildbot annotator scripts for the android
 # build of chromium.  Executing this script should not perform actions
 # other than setting variables and defining of functions.
 
 # Number of jobs on the compile line; e.g.  make -j"${JOBS}"
@@ skipping 54 matching lines @@
 
   echo "@@@BUILD_STEP Environment setup@@@"
   bb_parse_args "$@"
 
   local BUILDTOOL=$(bb_get_json_prop "$FACTORY_PROPERTIES" buildtool)
   if [[ $BUILDTOOL = ninja ]]; then
     export GYP_GENERATORS=ninja
   fi
   bb_setup_goma_internal
   . build/android/envsetup.sh
+<<<<<<< Updated upstream
+||||||| merged common ancestors

[Yaron, 2012/09/29 00:54:12]

I think you want to resolve this.. :)

[Isaac (away), 2012/09/29 01:09:03]

ummm.....

+}
+
+function bb_compile_setup {
+=======
+  adb kill-server
+}
+
+function bb_compile_setup {
+>>>>>>> Stashed changes
   local extra_gyp_defines="$(bb_get_json_prop "$FACTORY_PROPERTIES" \
      extra_gyp_defines)"
   export GYP_DEFINES+=" fastbuild=1 $extra_gyp_defines"
   if echo $extra_gyp_defines | grep -q clang; then
     unset CXX_target
   fi
   # Should be called only after envsetup is done.
   bb_run_gclient_hooks
 }
 
@@ skipping 214 matching lines @@
   )
 }
 
 # Retrieve a packed json property using python
 function bb_get_json_prop {
   local JSON="$1"
   local PROP="$2"
 
   python -c "import json; print json.loads('$JSON').get('$PROP', '')"
 }