tree 78b4850c16da558b6ec6fde5097ddd295f9e2bb8
parent c637e7efb8553ef6dd0956032649ee539b07c3ea
parent bdb1501d4726641c2045af8bf0438dd9accc87a7
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1645161179 +0000
committer Alexander Smundak <asmundak@google.com> 1646071837 +0000

resolve merge conflicts of c178021c320a49a2690403d3fca3c213294b27a6 to qt-dev-plus-aosp am: cee3a8836c am: b08fef7324 am: ffe59902cf am: 17b4746d43 am: bdb1501d47

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker/+/6938325

Change-Id: Ia838a74d4d1823aeb10ac77570aed15d23578e80