commit | b524c223a370238afb1e9364839b775a3ea75784 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 01:39:46 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 01:39:46 2021 +0000 |
tree | 9eb5ab7005ab14b8aa543160190d7a988e465bcc | |
parent | 7ef559482cf029c814c760d2167f631fa9c9f06a [diff] | |
parent | ff732e37f2b6f5ef91c7d0a559b37703f1c110c2 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 8c31f43216 -s ours am: ff732e37f2 -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: I5c1f025efb7bd610443ea6f146201b97ef5a2859