| Index: build/android/pylib/android_commands.py | 
| diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py | 
| index f8aecb78e0c2c220510f4c79735c37813d119e91..f7a0b3d3d5f483b0793976f2297f4ccb75ca808c 100644 | 
| --- a/build/android/pylib/android_commands.py | 
| +++ b/build/android/pylib/android_commands.py | 
| @@ -459,6 +459,14 @@ class AndroidCommands(object): | 
| if out.strip() != 'remount succeeded': | 
| raise errors.MsgException('Remount failed: %s' % out) | 
|  | 
| +  def KillAdbdDevice(self): | 
| +    logging.info('Killing adbd on the device...') | 
| +    adb_pids = self.ExtractPid('adbd') | 
| +    if adb_pids: | 
| +      self.RunShellCommandWithSU('kill %s' % ' '.join(adb_pids)) | 
| +    logging.info('Waiting for device to settle...') | 
| +    time.sleep(5) | 
| + | 
| def RestartAdbServer(self): | 
| """Restart the adb server.""" | 
| ret = self.KillAdbServer() | 
|  |