https://source.android.com/security/bulletin/2018-12-01

CVE-2018-9568
CVE-2018-10840
xpad: fix up merge issues with 3.18.128

I forgot to resolve these merge issues.  Take the upstream version of
this file as it contains all of the needed fixes, plus a bunch more.

Change-Id: I871602b2338584d0ce5e7758503be29b24b71a31
Reported-by: Ahmed Radaideh <ahmed.radaideh@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
1 file changed