diff options
author | Xin Li <delphij@google.com> | 2022-03-09 11:36:36 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-09 11:36:36 +0000 |
commit | f1ca96b75e8fe14e7589a741b860ae8a7403275d (patch) | |
tree | 2357a0901a10a4258ebb9e1bd017995e1d61eabb | |
parent | f103f3351469c3432c901063a83b3bf418fff38a (diff) | |
parent | 901b07b6eb76c8caf2cf25e5928a46ba2ee175d3 (diff) | |
download | Basic-f1ca96b75e8fe14e7589a741b860ae8a7403275d.tar.gz |
[automerger skipped] Merge Android 12L am: 07a39fc815 -s ours am: a7380df962 -s ours am: 42500dfc4c -s ours am: 901b07b6eb -s ours
am skip reason: Merged-In I6dbe30cd3a6a18c4186d45ebb161aec7dd941501 with SHA-1 ae376450ad is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2012832
Change-Id: I11bf5818d8e5bf47bc66c40470362125f636b560
0 files changed, 0 insertions, 0 deletions