tree 4490781cd8ab744ac2cb36e3211396f364059601
parent f6470472cad5d47232ed972ac74d13809a01cfa0
parent 94fc36d8fcc07d27989690d427c5b361515eb2bc
author Treehugger Robot <treehugger-gerrit@google.com> 1602569917 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602569917 +0000

Merge "Add OnLive Universal Controller media buttons mapping." am: 30951b0666 am: 94fc36d8fc

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

Change-Id: Ia418515b0c1f4b270cf07885f9c089d8ab146df8