tree e4b96a4e9a55ca09a40ec385e89b9300c5e55684
parent 54d55d88ecdd4408edbadcd58aa988d619c8f4d4
parent 22552b23c55d9184a111a269c904f36a45b9df0d
author Xin Li <delphij@google.com> 1673645745 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1673645745 +0000

[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 07d415ff37 -s ours am: 22552b23c5 -s ours

am skip reason: Merged-In I8c2bdef3e3cfe107b13dade69e33ce48fda5d713 with SHA-1 7a0900bfbf is already in history

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

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