tree 8c8c9efe19be63a9092bc01832b6fe90071a2685
parent 78ea35bef3afeb05508e3d444b0e093caadc455e
parent abc8502551ceabb98b6c6b11c3ac8642501b146f
author Treehugger Robot <treehugger-gerrit@google.com> 1596290605 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596290605 +0000

[automerger skipped] Merge "Add support for Razer Kishi game controller." am: dab3aaa5c6 am: d13c410dfa am: b2ccd88b3f am: 85ec9950e2 am: abc8502551 -s ours

am skip reason: Change-Id I6f94e212fe10f777f04ad9815468e2148d4252f5 with SHA-1 5230993c35 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1384139

Change-Id: I15900eeef6900b09aac229e3872904caceb7760c