[automerger skipped] Merge "Disable smart lock when in power menu on lock screen" into sc-qpr1-dev am: 60f0d698d5 am: 1e4b7c1126 -s ours am: d427ca7926 -s ours

Browse Source

am skip reason: Merged-In Id353faa1176882b6b9dfb9acd72288a3e0173aa0 with SHA-1 4e518ca343 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15566948

Change-Id: Ia375854e7b090c994f3edc9aa441a6f6cdd8b8d2

...

This commit is contained in:

TreeHugger Robot

2021-08-19 00:22:35 +00:00

committed by Automerger Merge Worker

parent 7041ce924b d427ca7926

commit f7ef51dfb7

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available