diff options
author | Xin Li <delphij@google.com> | 2022-03-08 11:07:21 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-08 11:07:21 +0000 |
commit | 2a48eb80a8134b15a6afe583447f8b7ecbb5a94e (patch) | |
tree | 130d6360024a00bfc826ef306a28751262eee244 | |
parent | 42500dfc4cca9515fd3c715577e70aa0d57442e0 (diff) | |
parent | 57b2b70e36f6a159682fb95c36d0033bd75098d5 (diff) | |
download | Basic-2a48eb80a8134b15a6afe583447f8b7ecbb5a94e.tar.gz |
[automerger skipped] Merge "Merge Android 12L" am: 994742e02a -s ours am: 57b2b70e36 -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: Ic0490403ab6c4159d7fc1d9ba8e15a4c1057c515
0 files changed, 0 insertions, 0 deletions