tree e74b294c1ec8e592925f407032ad1f3a2f0f3c6a
parent ed53bc5001e9bd71096594dfe243b06097b6b818
parent 9e38564f2b483e8e6ea5ebd65235b39b080aebe9
author Bill Yi <byi@google.com> 1600492977 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600492977 +0000

Merge mainline-release 6664920 to master - DO NOT MERGE am: 9e38564f2b

Original change: https://android-review.googlesource.com/c/platform/packages/apps/WallpaperPicker2/+/1430120

Change-Id: I6391d36b48e345f77d9663e6d90ee25aed598549