OSDN Git Service

Merge "Merge "Disable Wallpaper setting when Wallpaper is disabled." into oc-dr1...
authorDoris Ling <dling@google.com>
Wed, 26 Jul 2017 06:31:27 +0000 (06:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 06:31:27 +0000 (06:31 +0000)
am: 40449ad439  -s ours

Change-Id: I4a56176a86d101069473a71ff8f2559782554f69


Trivial merge