summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorDongwon Kang <dwkang@google.com>2015-04-29 05:52:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-29 05:52:39 +0000
commitd3fad391e1ccc79fbd0b9330f2aab60bf5b2075b (patch)
tree126d877868b239adb2803125d962c9833347807a /core
parent572b1078962437d7495f395bda0bc8125c833465 (diff)
parent633a45a0d4e095ae81fc2c3e882c23a6513bbaee (diff)
downloadframeworks_base-d3fad391e1ccc79fbd0b9330f2aab60bf5b2075b.zip
frameworks_base-d3fad391e1ccc79fbd0b9330f2aab60bf5b2075b.tar.gz
frameworks_base-d3fad391e1ccc79fbd0b9330f2aab60bf5b2075b.tar.bz2
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.
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions