tree 2bcf10b643ed8ecc41b87f98734b566963d59fd1
parent 24f99a6ca17ebbba1779cfb841f0101779edaba8
parent 8f39b980ee8e717cba7794e6d23b2dc0cea0d070
author Siarhei Vishniakou <svv@google.com> 1561408290 -0700
committer android-build-merger <android-build-merger@google.com> 1561408290 -0700

Merge "Keylayout for xbox controllers" into qt-dev am: 287b20ae0e am: 0ebe5b44e1
am: 8f39b980ee

Change-Id: Ia0aceba1cf5ef23361d497974a6b79b419a8bb36