The CL was intended only for P as a temporary solution. This reverts commit f0800fa3bd. Test: switch wallpapers, observe theme Bug: 110758454 Change-Id: If10e4d87b6ddac10063b2671abd99e0baccdf92e
f0800fa3bd
492457e94e
6c0106b57f
85bae863f5
90dbb0ed72
b5f35aeaf3
5442964205
7e957e57b7
04c66489bc