tree 71532400787441094959555414e974ac1c0b0087
parent 17704b8d1b53a6e1616d1386277aacc390c4c072
parent 77c1c938a576e2d892ab1fac07944b2b3670b34d
author Siarhei Vishniakou <svv@google.com> 1560445685 -0700
committer android-build-merger <android-build-merger@google.com> 1560445685 -0700

Merge "Add keylayout for Xbox One USB controller" into qt-dev
am: 77c1c938a5

Change-Id: I783281baeac2d10437826b2b21c5c086835ec677