tree 65565fefb13ca17a7ea97f922d53dd9f935a8d55
parent 6cf73953b6dd91c1dbf44203e0adf49b6bf1b24d
parent 23706d874b5e26bf23a7fb9084bdaf1fa21c01c4
author Bill Yi <byi@google.com> 1600492983 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600492983 +0000

Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: 23706d874b

Original change: https://android-review.googlesource.com/c/platform/packages/wallpapers/LivePicker/+/1429926

Change-Id: I69defeabb59cc3d8c7c0ca3862250b1e77157109