tree 2357a0901a10a4258ebb9e1bd017995e1d61eabb
parent 3db5b572a3ba8768106db5515b7f3cbebc4d5d82
parent 6a1fb03e6f648edb1f1f04f0ccecbd65415330e2
author Xin Li <delphij@google.com> 1648974661 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648974661 +0000

[automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 1938e6d3fb -s ours am: 33a43b8194 -s ours am: 6a1fb03e6f -s ours

am skip reason: Merged-In Ic8ce9767ea0075cc28d814a284a579b113bb7420 with SHA-1 1a56ac36d8 is already in history

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

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