OSDN Git Service

Merge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Tue, 23 May 2017 01:45:37 +0000 (01:45 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 23 May 2017 01:45:41 +0000 (01:45 +0000)
commitda3d71f01e5e5da0601c88d92076062d1d985176
treea4af0e468f8a23bb4b3c051ccf4a97b3ad0caf8b
parent87cef51e2b222472bd1a1f123533cdd2c971306e
parent1cf91a094f8b719fc1ab20a7a6861278633cdf28
Merge "Restore resetKeyStore() logic of clearing SYSTEM uid" into oc-dev
services/core/java/com/android/server/LockSettingsService.java