| Index: build/android/pylib/test_package_apk.py
 | 
| diff --git a/build/android/pylib/test_package_apk.py b/build/android/pylib/test_package_apk.py
 | 
| index 42b9ade68b33a506b3dc80fec29945b8f1706d63..598f5131cc0016e8a58c43a64a9bf18a2bf66e90 100644
 | 
| --- a/build/android/pylib/test_package_apk.py
 | 
| +++ b/build/android/pylib/test_package_apk.py
 | 
| @@ -11,6 +11,7 @@ import time
 | 
|  
 | 
|  import android_commands
 | 
|  import constants
 | 
| +from android_commands import errors
 | 
|  from test_package import TestPackage
 | 
|  from pylib import pexpect
 | 
|  
 | 
| @@ -65,7 +66,8 @@ class TestPackageApk(TestPackage):
 | 
|          break
 | 
|        time.sleep(i)
 | 
|      else:
 | 
| -      raise Exception('Unable to find fifo on device %s ' % self._GetFifo())
 | 
| +      raise errors.DeviceUnresponsiveError(
 | 
| +          'Unable to find fifo on device %s ' % self._GetFifo())
 | 
|      args = shlex.split(self.adb.Adb()._target_arg)
 | 
|      args += ['shell', 'cat', self._GetFifo()]
 | 
|      return pexpect.spawn('adb', args, timeout=timeout, logfile=logfile)
 | 
| 
 |