| commit | 6d7ef25576d1d3127aee2d05dcc1eb68bf948410 | [log] [tgz] |
|---|---|---|
| author | Jonathan Scott <scottjonathan@google.com> | Wed Mar 03 18:46:33 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 03 18:46:33 2021 +0000 |
| tree | 46ff28aa7e9831af8dff3689eda367cd22bbd687 | |
| parent | e6a803cbf420fa0abf5d36288fd87e9e322fd423 [diff] | |
| parent | b06d114a6075bcb0324a742a816be762ad9a02be [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Use userId instead of USER_CURRENT in shouldLockKeyguard." into rvc-dev am: 91ceae3ef7 am: b06d114a60 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13451947 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3f333f49ed76716c6979963e6f018e6b737f8099