Selim Cinek f66b77b92f Merge "Fixes an issue where the guts could disappear" into oc-mr1-dev am: 6b3501ab91 ...

am: 61282f612d

Change-Id: Icea2de548c1e8a5cd11efa96db446dd13985f5e1

2017-09-18 18:54:48 +00:00

..

keyguard

Merge "Allow FP authentication while screensaver (not AOD) is on" into oc-mr1-dev am: c6e9bb9da0

2017-09-11 22:07:34 +00:00

systemui

Merge "Fixes an issue where the guts could disappear" into oc-mr1-dev am: 6b3501ab91

2017-09-18 18:54:48 +00:00