| commit | c9534f61b520626075748d84d59d44d02ceae82d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 27 22:13:56 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 27 22:13:56 2021 +0000 |
| tree | 70707c563daa0d352f1d94987f75d9d11b853ca6 | |
| parent | 8e8e5f79e2d82f5a60b6883ddbb1beb45bfc3a45 [diff] | |
| parent | b474d2cb17166f9edc1e1a623cac75e45e39f33b [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into pi-dev am: d48073491f -s ours am: 65f650b6ac am: d2b2ae912b -s ours am: ad4df34c13 am: b474d2cb17 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473997 Change-Id: I769948e52a1c1f9c265c992d982974e3822c0949