| commit | d3fad391e1ccc79fbd0b9330f2aab60bf5b2075b | [log] [tgz] |
|---|---|---|
| author | Dongwon Kang <dwkang@google.com> | Wed Apr 29 05:52:39 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 05:52:39 2015 +0000 |
| tree | 126d877868b239adb2803125d962c9833347807a | |
| parent | 572b1078962437d7495f395bda0bc8125c833465 [diff] | |
| parent | 633a45a0d4e095ae81fc2c3e882c23a6513bbaee [diff] |
am 633a45a0: am 25466e0a: Merge "TIF: throw an exception if an operation takes too long." into mnc-dev * commit '633a45a0d4e095ae81fc2c3e882c23a6513bbaee': TIF: throw an exception if an operation takes too long.