Pasty Chang ec26d4e55c Merge "Change to show generic lock screen before setup fingerprint or face" into qt-dev am: 393492438b ...

am: bd758f8126

Change-Id: I8d4404796e4e5e0565546678c894da2319853717

2019-04-25 02:26:36 -07:00

..

android/settings

Merge "Change to show generic lock screen before setup fingerprint or face" into qt-dev am: 393492438b

2019-04-25 02:26:36 -07:00