| commit | 4ea0de334f5d287ed9eb777e5700f04a50a299d4 | [log] [tgz] |
|---|---|---|
| author | Dmitry Torokhov <dtor@google.com> | Thu Oct 08 17:15:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 08 17:15:55 2015 +0000 |
| tree | db28203df1975b5c9654eafb59fc2aa5620b58a9 | |
| parent | bb40f1706ef9b90176e657c5d20e5be715aa702b [diff] | |
| parent | 3b9211608669eb5aafba65d35b4cfbec89755499 [diff] |
am 3b921160: resolved conflicts for b9163905 to mnc-dr-dev-plus-aosp * commit '3b9211608669eb5aafba65d35b4cfbec89755499': Allow defining replacement key events in keymap