tree 2d0c89d8c153254e2c91f8ef27424a2722c9a553
parent f9c24b56c96e6004f8faa6b36c4c552fbd38b400
parent 8fc0593ddef6ddf956c7d82458210fa407373b75
author Jared Henderson <jaredh.microsoft@gmail.com> 1568221563 -0700
committer android-build-merger <android-build-merger@google.com> 1568221563 -0700

Merge "[automerger skipped] Merge "Update Xbox BT controller mapping for new FW" into qt-dev am: 1f978f5a8f am: 307e57c9a3 -s ours am: dc9d4d1bd0 -s ours
am: 8fc0593dde -s ours
am skip reason: change_id I8600ea79a0aa8557267d6ca712e5d56680e7a98b with SHA1 f829b5df5e is in history

Change-Id: Id817bfc095c8e2bf9f1dbcb6c6e46d6972453ccf