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

am: dac62d24f4  -s ours

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

Diff Content Not Available