OSDN Git Service

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

Change-Id: I6f51c2464ab39e78c89625a0e27296c888080333


Trivial merge