Matthew Ng f40af1ccc0 Merge "Reset touch location after touch slop is exceeded in recents" into oc-dev am: 02862f31f8 ...

am: 0bf5c1227b

Change-Id: I23ef52a0b4ad54cf195dcd65547911dcca70a2e0

2017-05-04 06:46:14 +00:00

..

keyguard

Merge "FP won't wake device if daemon dies" into oc-dev am: e3d3ffcb19

2017-04-28 03:58:38 +00:00

systemui

Merge "Reset touch location after touch slop is exceeded in recents" into oc-dev am: 02862f31f8

2017-05-04 06:46:14 +00:00