| commit | b474d2cb17166f9edc1e1a623cac75e45e39f33b | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Apr 27 21:56:28 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Apr 27 21:56:28 2021 +0000 |
| tree | e1a6ff8180051fe1b15e55e3bd1df0bc7d62e72f | |
| parent | c7a3cb93cf39ecff97e16e1f398bde1a150b3df6 [diff] | |
| parent | ad4df34c139f33000e663d315bb2aaaa86305e1b [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 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473997 Change-Id: Ic8a9a843aa34273d206e804ff7eca3cfab828d7c