summaryrefslogtreecommitdiffstats
path: root/libs/binder
diff options
context:
space:
mode:
authorHung-ying Tyan <tyanh@google.com>2010-09-24 15:19:05 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-24 15:19:05 -0700
commitd6d83279183db749de07bfdac79fe4180fc848d0 (patch)
tree2cbc5865af610175b59ba3c6a9b2ef4cc3f63a17 /libs/binder
parentf3ae63eef2d7f55c793b2e76d1371f82cea0aab7 (diff)
parent194bbcce9ba15634500f542b9ea017b2cf154b45 (diff)
downloadframeworks_base-d6d83279183db749de07bfdac79fe4180fc848d0.zip
frameworks_base-d6d83279183db749de07bfdac79fe4180fc848d0.tar.gz
frameworks_base-d6d83279183db749de07bfdac79fe4180fc848d0.tar.bz2
am 194bbcce: SIP: longer timeout for making call, shorter for cancelling
Merge commit '194bbcce9ba15634500f542b9ea017b2cf154b45' into gingerbread-plus-aosp * commit '194bbcce9ba15634500f542b9ea017b2cf154b45': SIP: longer timeout for making call, shorter for cancelling
Diffstat (limited to 'libs/binder')
0 files changed, 0 insertions, 0 deletions