Merge "[automerger skipped] Merge "Fixes usage of WallpaperManager to make it optional." into qt-qpr1-dev am: 659f477f65 am: 5c9f648edd -s ours am skip reason: change_id I88946f92ff54e556d289c41c28e22da3a4b8c8b8 with SHA1 34a861add1 is in history"
This commit is contained in:
committed by
Android (Google) Code Review
commit
ea4ab86f9c