Merge "adb/test_device.py: fix finding md5 command on pre-L platforms"

am: a80834e943

* commit 'a80834e943292c4c8f1366f8133908576b32373c':
  adb/test_device.py: fix finding md5 command on pre-L platforms
This commit is contained in:
Josh Gao
2015-10-22 01:09:47 +00:00
committed by android-build-merger

View File

@@ -404,7 +404,7 @@ def get_md5_prog(device):
try:
device.shell(['md5sum', '/proc/uptime'])
return 'md5sum'
except subprocess.CalledProcessError:
except adb.ShellError:
return 'md5'