tree b0b6961f8a8e3305fcc97e9f2ec8e927f2c2cc0c
parent 3e9b74371510262343abc8549ffec923d53c1424
parent 1f6af2e76937fa81c8d865e45172514d4b199155
author Kim Low <klow@gaikai.com> 1537405508 -0700
committer android-build-merger <android-build-merger@google.com> 1537405508 -0700

Merge "Added mapping files for DualShock3 and DualShock4" am: 85aadab7e4 am: d050a2edd6
am: 1f6af2e769

Change-Id: I239e8e9aff10e7472fb841261df7e23466202dd2