tree 8e8b6c418c465031d545885a27e1db01807e9397
parent e8cf5f5ccd665c41b22f2c4c9636c2ddabb0b499
parent 34c6c661535f332ed7158d0785e5ab1c5330a934
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596493896 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596493896 +0000

Merge "Merge "Add KEYCODE_MEDIA_AUDIO_TRACK mapping to USB HID Usage consumer page (0x0c/0x173) "Alternate Audio Increment"" am: 21e6488ae7 am: ecd346e431 am: 6b96fe8128 am: 67236850f5" into rvc-qpr-dev-plus-aosp am: 34c6c66153

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

Change-Id: I40b85269a1f0c9ae065b12a7842d3be1e7c9b0f4