Merge commit 'bdea782aa297b73962f5d9d6b37ed2c6f0d301b7' into HEAD

Change-Id: Id4c442a8becf984b26d5a4bb227aeea189a19954

1 files changed, 4 insertions, 1 deletions

diff --git a/utils.py b/utils.py
index 65b2eee..c6e13c2 100644
--- a/utils.py
+++ b/utils.py
@@ -247,4 +247,7 @@ class AndroidDevice(object):
         if return_code != 0 or err.strip():
             raise IOError("`find %s -name '%s' %s` stdout: %s\nstderr: %s" %
                           (path, name_pattern, " ".join(options), out, err))
-        return out.strip().split("\n")
+
+        # Return empty file list when out is an empty string.
+        out = out.strip()
+        return out.split("\n") if out else []