am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation takes...
am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev
* commit '633a45a0':
TIF: throw an exception if an operation takes too long.