| Index: build/android/tombstones.py | 
| diff --git a/build/android/tombstones.py b/build/android/tombstones.py | 
| index dbfe3f76c2887270eeeb90fd02ea31fead5b574c..2ff74d1bdf5625ed128707b80e973151caabc062 100755 | 
| --- a/build/android/tombstones.py | 
| +++ b/build/android/tombstones.py | 
| @@ -48,6 +48,8 @@ def _ListTombstones(device): | 
| yield details[-1], t | 
| except device_errors.CommandFailedError: | 
| logging.exception('Could not retrieve tombstones.') | 
| +  except device_errors.CommandTimeoutError: | 
| +    logging.exception('Timed out retrieving tombstones.') | 
|  | 
|  | 
| def _GetDeviceDateTime(device): | 
|  |