commit | ff732e37f2b6f5ef91c7d0a559b37703f1c110c2 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 01:20:21 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:20:21 2021 +0000 |
tree | 9eb5ab7005ab14b8aa543160190d7a988e465bcc | |
parent | 05eede44568b9686ac2c078b9052b8f651af012c [diff] | |
parent | 8c31f43216c36818aa15a002e7f9b3b5bf0c3b06 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 8c31f43216 -s ours am skip reason: Merged-In I6bc8d4e016df9ea4c718e0ef243ac19cc1fa4094 with SHA-1 05eede4456 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/1847712 Change-Id: I4502dde66777431b07de0b801e726aa1bc4b3c4f