OSDN Git Service

Merge "Fix SyntheticPasswordTests"
authorKevin Chyn <kchyn@google.com>
Fri, 22 Feb 2019 06:21:49 +0000 (06:21 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 22 Feb 2019 06:21:49 +0000 (06:21 +0000)
commit7464798a1b099a16eea6c3ad7d90a8527136fda4
tree0d5c3e6ce91c5656d889cdf05bc40f7f01bd64be
parent47aa1516f673278738ad1cc376587507fd47034a
parentcf1a62e830010090dc5774900300182ae09c35f6
Merge "Fix SyntheticPasswordTests"
services/core/java/com/android/server/locksettings/LockSettingsService.java
services/tests/servicestests/src/com/android/server/locksettings/LockSettingsServiceTestable.java