diff options
author | Xin Li <delphij@google.com> | 2021-10-08 09:00:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 09:00:12 +0000 |
commit | 38a2ed8063b1fe4bd6f7aab231af44e694e64881 (patch) | |
tree | 2357a0901a10a4258ebb9e1bd017995e1d61eabb | |
parent | 46bc0f7206935f79690bb83a9b05c0cf1eda3d16 (diff) | |
parent | 5777d2e5c8777f2d947710a3c4b4ac176ab61110 (diff) | |
download | Basic-38a2ed8063b1fe4bd6f7aab231af44e694e64881.tar.gz |
[automerger skipped] Merge "Merge Android 12" am: 0b55aed83b -s ours am: feba27c9b1 -s ours am: 22e93151f9 -s ours am: 211efd2c34 -s ours am: 5777d2e5c8 -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: I9c9e91c0d263382a085b433e04eb5ee434f277e7
0 files changed, 0 insertions, 0 deletions