| commit | 5bc4325c380b3d36d8d73d4482fc4f7bed6cc449 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 27 22:14:25 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 27 22:14:25 2021 +0000 |
| tree | 70707c563daa0d352f1d94987f75d9d11b853ca6 | |
| parent | 2ec8cc307dc47ddf61a196da6211f9ebcd90bce1 [diff] | |
| parent | 32765441680984b4678f093d1b5bdc172a2f50dc [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 am: 3276544168 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473565 Change-Id: I2c8830683c7a49847933d2464c6d8baf79f8ede0