Merging from default

--HG-- branch : production
mozilla · Jan 22, 2015 · 05befb2 · 05befb2
2 parents b4c0aa8 + b9e463e
commit 05befb2
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 323 deletions.
diff --git a/configs/android/androidarm.py b/configs/android/androidarm.py
@@ -13,7 +13,6 @@
     ".avds_dir": "/home/cltbld/.android",
     "emulator_process_name": "emulator64-arm",
     "emulator_cpu": "cortex-a9",
-    "device_manager": "sut",
     "exes": {
         'adb': '/tools/android-sdk18/platform-tools/adb',
         'python': '/tools/buildbot/bin/python',

diff --git a/configs/android/androidarm_4_4.py b/configs/android/androidarm_4_4.py
diff --git a/configs/android/androidx86.py b/configs/android/androidx86.py
@@ -12,7 +12,6 @@
     "tooltool_servers": ["http://tooltool.pvt.build.mozilla.org/build/"],
     ".avds_dir": "/home/cltbld/.android",
     "emulator_process_name": "emulator64-x86",
-    "device_manager": "sut",
     "exes": {
         'adb': '/tools/android-sdk18/platform-tools/adb',
         'python': '/tools/buildbot/bin/python',