tree fad0332101f1eddce36ac615403cb9829e0aec33
parent 6f89a1f8568aefb51a435da64b4bece5435ecadb
parent 0e1317035b8d92622243e03ae062f76eaee6bb3b
author Xin Li <delphij@google.com> 1697741288 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697741288 +0000

[automerger skipped] Merge 10952656 am: 0e1317035b -s ours

am skip reason: Merged-In I56d6abb140399abd229b0012cb93eec62a77a325 with SHA-1 6f89a1f856 is already in history

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

Change-Id: Ida8ec3847a90fa59362359ca442958040393912f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>