[automerger skipped] Merge "Disable smart lock when in power menu on lock screen" into sc-v2-dev am: 04b483b499 am: 0ba5ad306d -s ours

Browse Source

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

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

Change-Id: I13796743336e8ef15ba3b547541dabcba8600bdd

...

This commit is contained in:

Beth Thibodeau

2021-08-18 23:38:23 +00:00

committed by Automerger Merge Worker

parent 4e3b0a5093 0ba5ad306d

commit 7e0672c082

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