OSDN Git Service

Merge "Change to show generic lock screen before setup fingerprint or face" into...
authorPasty Chang <pastychang@google.com>
Thu, 25 Apr 2019 09:16:00 +0000 (02:16 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Apr 2019 09:16:00 +0000 (02:16 -0700)
commitbd758f81265890884944434938528133a810666a
tree1665517f1a031bf363a8273a62d853159f07781d
parentf55d2a0bdc69c2c232b412a55ab4cf2dd01bf64f
parent393492438b27c82b66373b5616dc60635e987d85
Merge "Change to show generic lock screen before setup fingerprint or face" into qt-dev
am: 393492438b

Change-Id: I1fa9ef561d0b90588b5d6817360cadf004cb6010