tree 9eb5ab7005ab14b8aa543160190d7a988e465bcc
parent 763b1ddb0f290407e08ac0d1ca0134cba58821e9
parent b524c223a370238afb1e9364839b775a3ea75784
author Xin Li <delphij@google.com> 1633679822 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679822 +0000

[automerger skipped] Merge "Merge Android 12" am: 8c31f43216 -s ours am: ff732e37f2 -s ours am: b524c223a3 -s ours

am skip reason: Merged-In I6bc8d4e016df9ea4c718e0ef243ac19cc1fa4094 with SHA-1 05eede4456 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/1847712

Change-Id: I6e59c0773e795c8eb0fdde5e17b76d49ac3f9755