tree da034ae49356add11cdd795fbb36de57fa9c9b6e
parent 863d640e58e8c0fc8247148f4346bcb56a35c64a
parent b4230be81cdba642e492b3329929826c691d0073
author Xin Li <delphij@google.com> 1697741282 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1697741282 +0000

[automerger skipped] Merge 10952656 am: b4230be81c -s ours

am skip reason: Merged-In I45b68b89af5f9cbc09d9d3809fbf71876cc8f2cf with SHA-1 863d640e58 is already in history

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

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