commit | a646d52172c05418adce2e69f2ad4bbe8d1bb510 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Dec 12 13:47:58 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 12 13:47:58 2022 +0000 |
tree | e4b96a4e9a55ca09a40ec385e89b9300c5e55684 | |
parent | 154bc60ab34fff6a724f30c3f2e5c6082804ddc7 [diff] | |
parent | a93ab4dac0e8a5f11d5bf75a5c3e4548f1ea8ad6 [diff] |
[automerger skipped] Merge "Merge Android 13 QPR1" am: 402ce341a6 -s ours am: 9dd8a1857e -s ours am: a93ab4dac0 -s ours am skip reason: Merged-In Ic683c6804e6db9ab2edb3d2c8b524c03b8844a08 with SHA-1 360a0a6499 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/Basic/+/2337139 Change-Id: I18c601592598853b4832e0bcfbcbf773eb026133 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>