OSDN Git Service

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

Change-Id: Idb5b70997a0b9808fc57b0f8b2ab6a3d8b19d278