tree 0b66d780ef4a96fbb655b25677198046b971cafc
parent 5c20073085e6d800e150e76dad18de72b791928d
parent 15e77132ccb422e1ba404b2cda3991ea4a1d8bc1
author Josh Tsuji <tsuji@google.com> 1628090965 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628090965 +0000

Merge "Disable unlocked screen off if the display needs blanking." into sc-dev am: 15e77132cc

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

Change-Id: I34fe2a4803ae062a5f294597a6bead35f86a37a9