summaryrefslogtreecommitdiff
path: root/libs/ui/KeyCharacterMap.cpp
diff options
context:
space:
mode:
author Andreas Huber <andih@google.com> 2010-10-15 00:08:35 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-10-15 00:08:35 -0700
commit88cb3809df144d758c4b3b59c6b3f961c72dcf6b (patch)
treee44a9222f8a53d8bafecfa4fad9751e557134a8d /libs/ui/KeyCharacterMap.cpp
parent37abeed739cfc859faf4c31904a5026473b12748 (diff)
parentf8659dd62b780abc94d9e78ac6e0e1dd378d8968 (diff)
am 8e4f3c76: am 646e0d5a: Merge "Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these..." into gingerbread
Merge commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160' * commit '8e4f3c76dd7f5596fa2fe10bdf008d4c02353160': Some webcams output rtp streams but never send any rtcp data in violation of
Diffstat (limited to 'libs/ui/KeyCharacterMap.cpp')
0 files changed, 0 insertions, 0 deletions