Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1-dev

am: 4906a2a38a  -s ours

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

Diff Content Not Available