Kevin Chyn 5431f908ab Merge "FP won't wake device if daemon dies" into oc-dev am: e3d3ffcb19 ...

am: 64d4e903fe

Change-Id: I2fd61cb1674a6cd1578d5989c76322a259d6ce78

2017-04-28 03:58:38 +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 "AOD: Wake up on double tap instead of requesting pulse"

2017-04-28 01:39:40 +00:00