tree 130d6360024a00bfc826ef306a28751262eee244
parent 0f90a54c1b7f6a4a581d3a14e2bbe01b0a9f9354
parent 22e93151f9e6703be7d1511120ab16d6544859b9
author Xin Li <delphij@google.com> 1633679824 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679824 +0000

[automerger skipped] Merge "Merge Android 12" am: 0b55aed83b -s ours am: feba27c9b1 -s ours am: 22e93151f9 -s ours

am skip reason: Merged-In I0c3c2efd9dc8b5e7d5bbaa33723b1921e680ab8c with SHA-1 440d9d5afc is already in history

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

Change-Id: Ie108b693feb4f833aa9f1c86f944d98ee4b2dabc