Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev am: 4906a2a38a

am: 3ab3fc9ee4  -s ours

Change-Id: I4cd260bd057d9e638f4848eb41aa9cd2ae8f3c35
This commit is contained in:
Doris Ling
2017-07-26 06:27:07 +00:00
committed by android-build-merger

Diff Content Not Available