commit | ae509461ef21d43c52d0fe489614c2c54e0fae25 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 27 21:57:38 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 27 21:57:38 2021 +0000 |
tree | 23775d8a0280412eff723c1341776e7e971380c3 | |
parent | 94ea2ea32ad31d91853ae70ed9926bcc23a2446f [diff] | |
parent | 48cb3da79222c6b81212a27dd5e0bec28c850db7 [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into qt-dev am: e086a17e7d am: 67352cf086 -s ours am: 48cb3da792 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473565 Change-Id: Iee9500e3317bb6c55813c6d298ba6b251fa808c8