Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-mr1-dev am: 0224a409a9
am: 99d3b353c6
-s ours
Change-Id: I2902f06ec76ce4cbb2da5a125ec65838d4137d2b
This commit is contained in:
0224a409a9
am: 99d3b353c6
-s ours
Change-Id: I2902f06ec76ce4cbb2da5a125ec65838d4137d2b