| commit | 32765441680984b4678f093d1b5bdc172a2f50dc | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 27 21:56:45 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 27 21:56:45 2021 +0000 |
| tree | e1a6ff8180051fe1b15e55e3bd1df0bc7d62e72f | |
| parent | 71348ece4f1d50a8c486b3e4ea143a747bc55cb6 [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: I901bb7d2cfc241bae6da3ac5ee000a7af97d90b5