diff options
| author | Xin Li <delphij@google.com> | 2021-10-08 01:39:49 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 01:39:49 +0000 |
| commit | 22e93151f9e6703be7d1511120ab16d6544859b9 (patch) | |
| tree | 130d6360024a00bfc826ef306a28751262eee244 | |
| parent | 20af630876955aafaac6490cb646d6018bd37565 (diff) | |
| parent | feba27c9b1634ab0002353b2276251fc9c7c7a64 (diff) | |
| download | Basic-22e93151f9e6703be7d1511120ab16d6544859b9.tar.gz | |
[automerger skipped] Merge "Merge Android 12" am: 0b55aed83b -s ours am: feba27c9b1 -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: If83bb491fc3098af152f7942a4f3e1a40bc193de
0 files changed, 0 insertions, 0 deletions