OSDN Git Service

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

Change-Id: I87caaa3377f1146a7bf4b0737463152ab3db2f20


Trivial merge