Kill adb server each buildbot run

build/android/buildbot/buildbot_functions.sh

Index: build/android/buildbot/buildbot_functions.sh
diff --git a/build/android/buildbot/buildbot_functions.sh b/build/android/buildbot/buildbot_functions.sh
index 9810cd0ecc320df3637def93d798b52ad9f1c560..f1d54e4d0752f7f7004c16253d954f314578ebdb 100755
--- a/build/android/buildbot/buildbot_functions.sh
+++ b/build/android/buildbot/buildbot_functions.sh
@@ -72,6 +72,17 @@ function bb_baseline_setup {
   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"