| commit | 6ef38d73d621b27e97fc76a55633c09fd2fd2b88 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Thu Dec 02 15:25:18 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 02 15:25:18 2010 -0800 |
| tree | d0bc6f70bc48a6d18f0ca954a3b4a5dcc2e830b6 | |
| parent | 399980ff1fd185167262ffc065132f5aa7364e3f [diff] | |
| parent | 438267d997c4f8f2fab4ed23655d2ad87b169bf8 [diff] |
am a30c12a1: am 4a88013a: resolved conflicts for merge of bf1439c5 to stage-korg-master * commit 'a30c12a18326ed4d608382cd4f970a6e15a58bf5': Preserve flags field of event passed to injectKeyEvent()