Commit 4ea0de33 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Android Git Automerger
Browse files

am 3b921160: resolved conflicts for b9163905 to mnc-dr-dev-plus-aosp 

* commit '3b921160':
  Allow defining replacement key events in keymap
parents bb40f170 3b921160
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment