am 4a88013a: resolved conflicts for merge of bf1439c5 to stage-korg-master

Browse Source

* commit '4a88013a4a06a9ea80e8419f94694936e6b013f0':
  Preserve flags field of event passed to injectKeyEvent()

...

This commit is contained in:

Jean-Baptiste Queru 2010-12-02 15:21:35 -08:00 committed by Android Git Automerger

parent 784a43fef7 a4130babac

commit 438267d997

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available