OSDN Git Service

Merge "Do not hide keyguard message when fp" into pi-dev am: 2d2d79b92c
authorLucas Dupin <dupin@google.com>
Fri, 11 May 2018 18:15:50 +0000 (11:15 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 11 May 2018 18:15:50 +0000 (11:15 -0700)
am: 24ef8f99ab

Change-Id: I86ae14bd8fd0f6c47dacca95163b38e6f741e18c


Trivial merge