commit | 55cd97f94c7e821e42f43d61583dd66d17f2d95f | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Sat Feb 20 11:42:26 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 20 11:42:26 2021 +0000 |
tree | 38bc566d66d574ccb61b5254971ccc4290744b95 | |
parent | 2540861d4fff04cdc0778fb64d5ba9a020a39b59 [diff] | |
parent | 7fa15840a84480cee06715ba1c68d53ecd9fa4aa [diff] |
Merge "Integrate IKeystoreUserManager aidl with LockSettingsService." am: bfc1f6b382 am: 7fa15840a8 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1578423 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I97ec4f0aa946c4847aaa5ff1ddc77c0d133d65f7