summaryrefslogtreecommitdiff
path: root/libs/ui/KeyLayoutMap.cpp
diff options
context:
space:
mode:
author Hung-ying Tyan <tyanh@google.com> 2010-09-24 15:19:05 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-09-24 15:19:05 -0700
commit099774e68df2a89b6d49bc98756001cf73b20ba3 (patch)
tree28ad319947017e982aaaec80be78fe42c4adc741 /libs/ui/KeyLayoutMap.cpp
parentb44a5390d5c10ed8dfaa425ca16bf20da945fd9a (diff)
parent5b82faf85c96a135ffff198660f76430c834e9c8 (diff)
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/ui/KeyLayoutMap.cpp')
0 files changed, 0 insertions, 0 deletions