commit | 874def167d2c0258863cf7b7473b519856547dc6 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Oct 08 08:30:00 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 08 08:30:00 2021 +0000 |
tree | 9eb5ab7005ab14b8aa543160190d7a988e465bcc | |
parent | f313e2d5ef8a6ace12a4966100817111f8800cbb [diff] | |
parent | 0ef05f145176ec809ee3c1af6da80ff6e0a1ed22 [diff] |
[automerger skipped] Merge "Merge Android 12" am: 8c31f43216 -s ours am: ff732e37f2 -s ours am: b524c223a3 -s ours am: 0ef05f1451 -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: I7aa70f00f04e74cbbe5ef3871ad50c01f964e59c