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

This commit is contained in:
Android Build Merger (Role)
2017-07-26 06:27:25 +00:00
committed by Android (Google) Code Review

Diff Content Not Available