tree da034ae49356add11cdd795fbb36de57fa9c9b6e
parent dfcaa9c4ab0c08aa7ea2b767955619106a69657a
parent 69145f55cb2ff4dacf69d1494b5836a469b949f7
author Xin Li <delphij@google.com> 1673645741 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673645741 +0000

[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 3a05b0c0c3 -s ours am: 69145f55cb -s ours

am skip reason: Merged-In I04c2c9d5f23e01f641aaab1b151622c149eb7b40 with SHA-1 a32dcc11d4 is already in history

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

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