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

Browse Source

am skip reason: Merged-In Id353faa1176882b6b9dfb9acd72288a3e0173aa0 with SHA-1 525fd25296 is already in history

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

Change-Id: Ifefe508a02f1b587dbf590be3964b93d2869bd05

...

This commit is contained in:

TreeHugger Robot

2021-08-19 00:06:42 +00:00

committed by Automerger Merge Worker

parent 828c28a202 eadafbb63e

commit 8cb1413a7a

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