tree 3fbdbf01441f219727ba2b8994c08e0fcb1ec1a8
parent acad4f578b990ce08f190d20e3ad4d1cd4221ff2
parent 29c4e7949b3537b6f02ee1e30cb5761192c9102b
author Tony Wickham <twickham@google.com> 1584760394 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584760394 +0000

[automerger skipped] [DO NOT MERGE] Support blacklisting live wallpapers from showing sysui scrims am: 3b5f2224c6 -s ours am: 6b516bd63e am: 29c4e7949b

Change-Id: I057a073622a0c5a19ea8e7b822930cfb51e90a19