b08fef7324e2ffc4eb85a716b367053a5cfbbf40 - platform/packages/apps/WallpaperPicker

commit: b08fef7324e2ffc4eb85a716b367053a5cfbbf40
[log]
author: Automerger Merge Worker <[email protected]>
Sat Feb 22 06:07:30 2020 +0000
committer: Automerger Merge Worker <[email protected]>
Sat Feb 22 06:07:30 2020 +0000
tree: b68dc71ff57765374166a160f814a15ada668ee2
parent: 4fd92c61750364cf0d52191d81e376e3a688ee1b [diff]
parent: cee3a8836cd990bbaf7a1783f7310118042c6344 [diff]

resolve merge conflicts of c178021c320a49a2690403d3fca3c213294b27a6 to qt-dev-plus-aosp am: cee3a8836c

Change-Id: I653f4192444479d21bd3cadbe0491755df47112c

tree: b68dc71ff57765374166a160f814a15ada668ee2

res/
src/
.gitignore
Android.bp
AndroidManifest.xml
build.gradle
CleanSpec.mk
LibraryManifest.xml