| Index: masters/master.client.skia.android/slaves.cfg | 
| diff --git a/masters/master.client.skia.android/slaves.cfg b/masters/master.client.skia.android/slaves.cfg | 
| index 6d17ab1d62478b0584115987fc162bbae9922953..136f1998f667461e5861edcc41190dfaf44ec6a0 100644 | 
| --- a/masters/master.client.skia.android/slaves.cfg | 
| +++ b/masters/master.client.skia.android/slaves.cfg | 
| @@ -3,12 +3,6 @@ | 
| # found in the LICENSE file. | 
|  | 
|  | 
| -ANDROID_KEEPALIVE_CONDITION = ['python', | 
| -    'buildbot/slave/skia_slave_scripts/android_verify_device.py', '--serial', | 
| -    '%(serial)s'] | 
| -DEFAULT_ANDROID_SDK_ROOT = '/home/chrome-bot/android-sdk-linux' | 
| - | 
| - | 
| slaves = [ | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -21,9 +15,6 @@ slaves = [ | 
| 'Test-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug', | 
| 'Test-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release', | 
| ], | 
| -    'serial':  '03f61449437cc47b', | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -36,9 +27,6 @@ slaves = [ | 
| 'Test-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Debug', | 
| 'Test-Android-GCC-Nexus5-GPU-Adreno330-Arm7-Release', | 
| ], | 
| -    'serial':  '018dff3520c970f6', | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -48,9 +36,6 @@ slaves = [ | 
| 'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug', | 
| 'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release', | 
| ], | 
| -    'serial': '015d210a13480604', | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -60,9 +45,6 @@ slaves = [ | 
| 'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug', | 
| 'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release', | 
| ], | 
| -    'serial': '015d18848c280217', | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -72,9 +54,6 @@ slaves = [ | 
| 'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Debug', | 
| 'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release', | 
| ], | 
| -    'serial': '015d16897c401e17', | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -84,9 +63,6 @@ slaves = [ | 
| 'Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Debug', | 
| 'Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release', | 
| ], | 
| -    'serial': 'R32C801B5LH', | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -96,9 +72,6 @@ slaves = [ | 
| 'Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Debug', | 
| 'Test-Android-GCC-Nexus10-GPU-MaliT604-Arm7-Release', | 
| ], | 
| -    'serial': 'R32CB017X2L', | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -110,9 +83,6 @@ slaves = [ | 
| 'Test-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Debug', | 
| 'Test-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release', | 
| ], | 
| -    'serial': 'D76C708B', | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -124,9 +94,6 @@ slaves = [ | 
| 'Test-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Debug', | 
| 'Test-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release', | 
| ], | 
| -    'serial': '8AB5139A', | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -136,10 +103,6 @@ slaves = [ | 
| 'Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug', | 
| 'Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release', | 
| ], | 
| -    'serial': '4df713b8244a21cf', | 
| -    'has_root': False, | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -149,10 +112,6 @@ slaves = [ | 
| 'Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug', | 
| 'Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release', | 
| ], | 
| -    'serial': '32309a56e9b3a09f', | 
| -    'has_root': False, | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -162,10 +121,6 @@ slaves = [ | 
| 'Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Debug', | 
| 'Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Release', | 
| ], | 
| -    'serial': '4d0032a5d8cb6125', | 
| -    'has_root': False, | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -175,10 +130,6 @@ slaves = [ | 
| 'Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Debug', | 
| 'Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Release', | 
| ], | 
| -    'serial': '4d00353cd8ed61c3', | 
| -    'has_root': False, | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -191,9 +142,6 @@ slaves = [ | 
| 'Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Debug', | 
| 'Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Release', | 
| ], | 
| -    'serial': 'HT43RJT00022', | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -206,9 +154,6 @@ slaves = [ | 
| 'Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Debug', | 
| 'Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Release', | 
| ], | 
| -    'serial': 'HT4AEJT03112', | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| { | 
| 'master': 'SkiaAndroid', | 
| @@ -221,8 +166,5 @@ slaves = [ | 
| 'Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Debug', | 
| 'Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Release', | 
| ], | 
| -    'serial': 'HT4ADJT03339', | 
| -    'keepalive_conditions': [ANDROID_KEEPALIVE_CONDITION], | 
| -    'android_sdk_root': DEFAULT_ANDROID_SDK_ROOT, | 
| }, | 
| ] | 
|  |