summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2022-03-08 11:04:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-08 11:04:10 +0000
commit42500dfc4cca9515fd3c715577e70aa0d57442e0 (patch)
tree130d6360024a00bfc826ef306a28751262eee244
parent99f66e6e48544a39d37f90e6017704e3624efe9c (diff)
parenta7380df962eccf8758cf1e646fd93a35b432b651 (diff)
downloadBasic-42500dfc4cca9515fd3c715577e70aa0d57442e0.tar.gz
[automerger skipped] Merge Android 12L am: 07a39fc815 -s ours am: a7380df962 -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: If5b5534bc469e3d98f47a75a71eced8522b650cf
0 files changed, 0 insertions, 0 deletions