summaryrefslogtreecommitdiff
path: root/libs/ui/VirtualKeyMap.cpp
diff options
context:
space:
mode:
author Jean-Baptiste Queru <jbq@google.com> 2010-11-19 16:56:49 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2010-11-19 16:56:49 -0800
commit9b99eb350e6b5cfaa0acb94f0f81da904e9d0987 (patch)
tree2ec012fa06311ad0e6b94c9161848be293a3a0fe /libs/ui/VirtualKeyMap.cpp
parent6bca1b0809f8a415469317e62b95b8338377103c (diff)
parentf863896d52c6006e79e9f5fcc406bc12f2239fae (diff)
am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp
* commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2': StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
Diffstat (limited to 'libs/ui/VirtualKeyMap.cpp')
0 files changed, 0 insertions, 0 deletions