| commit | 3e8e6c60b69f9001e95a65c6518883256758cbad | [log] [tgz] |
|---|---|---|
| author | Jonathan Scott <scottjonathan@google.com> | Wed Mar 03 18:24:04 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 18:24:04 2021 +0000 |
| tree | 6f58e2bc47751197d720cee2f025ca70c0cdf922 | |
| parent | daa97df4dcfa56d291712dbf7f44ed62f6e9869b [diff] | |
| parent | b4bb7d172004065fbf4d0a0c5ca332c60ea86f5c [diff] |
Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-dev am: 91ceae3ef7 am: b4bb7d1720 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13451947 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I56e12a0ec1c6ea6930690b0c0b387ec5553a79c4