Skip to content
Commit 18053501 authored by The Android Open Source Project's avatar The Android Open Source Project Committed by Android Git Automerger
Browse files

am f51538f4: (-s ours) Reconcile with jb-mr2-release - do not merge 

* commit 'f51538f4':
  Revert "Stop marking gamepads as keyboards"
  Revert "Temporarily disable 'Scan Always' mode"
parents a7ac8be1 f51538f4
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment