summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/SurfaceFlinger.cpp
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-09-24 15:58:09 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-24 15:58:09 -0700
commite7f7f46663b03f05a99e1ec41ac99c778737b9bb (patch)
tree4cd25458f677fb86395886c20fcf8059094ecb17 /services/surfaceflinger/SurfaceFlinger.cpp
parent4399547d67ff4e06356d5e7f559207d14774e0b8 (diff)
parent099774e68df2a89b6d49bc98756001cf73b20ba3 (diff)
am d6d83279: am 194bbcce: SIP: longer timeout for making call, shorter for cancelling
Merge commit 'd6d83279183db749de07bfdac79fe4180fc848d0' * commit 'd6d83279183db749de07bfdac79fe4180fc848d0': SIP: longer timeout for making call, shorter for cancelling
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
0 files changed, 0 insertions, 0 deletions