| commit | 438267d997c4f8f2fab4ed23655d2ad87b169bf8 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Dec 02 15:21:35 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 02 15:21:35 2010 -0800 |
| tree | 1828739c054617c3bfa5cb08c15e109c60faa99b | |
| parent | 784a43fef797ca337acd07b62a9377081111cb9a [diff] | |
| parent | a4130babacff65bcad80ff0a67f22ab0f3b9b527 [diff] |
am 4a88013a: resolved conflicts for merge of bf1439c5 to stage-korg-master * commit '4a88013a4a06a9ea80e8419f94694936e6b013f0': Preserve flags field of event passed to injectKeyEvent()