[automerger skipped] Merge "Fix a incorrect class cast in GameControllerPreferenceCtrl" into pi-dev am: 5605795526
am: 7d4a11e3d3
-s ours
Change-Id: I65653749d989a051d4cbadc528701c41ec691038
This commit is contained in: