summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2022-03-09 11:39:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-03-09 11:39:36 +0000
commit342430ccdc0347ec6d8a7ac25e792b9487a6ac60 (patch)
treee0969b537a5855738e399f682f45df5438a0fc70
parentb677d80ccf09560fc410d74f69ba7b2dfa2a6aec (diff)
parent7123fe542aa5551c529fff31b49169470976b51a (diff)
downloadPhotoTable-342430ccdc0347ec6d8a7ac25e792b9487a6ac60.tar.gz
[automerger skipped] Merge "Merge Android 12L" am: 329e708f5b -s ours am: 8ca3108d2d -s ours am: 1e92b940ce -s ours am: 7123fe542a -s ours
am skip reason: Merged-In I5d2c0a01c7f563975c14bb9a14032c4e37063378 with SHA-1 69a7e2e2c3 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2013425 Change-Id: I1be4e0bd947109098e79fcfaea2e8df1dd3906c5
0 files changed, 0 insertions, 0 deletions