commit | e5f61b311140ad1ead7cf7cc5c8a03793fb11281 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Mon Dec 11 22:02:36 2023 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 11 22:02:36 2023 +0000 |
tree | da034ae49356add11cdd795fbb36de57fa9c9b6e | |
parent | 10ac15e6388d912ecdb32b47c63f350c20aaf37e [diff] | |
parent | 2d90d14b79939caa31e5b4ce35ebd6447f2c4947 [diff] |
[automerger skipped] Merge Android 14 QPR1 am: e55eb3cab3 -s ours am: 2d90d14b79 -s ours am skip reason: Merged-In Ie50e6fc11ce38ad6a0d7058c16e24780153e3d65 with SHA-1 b4230be81c is already in history Original change: https://android-review.googlesource.com/c/platform/packages/screensavers/PhotoTable/+/2864972 Change-Id: Ia8350169f7d70a476e08022e8bbb53864ad56294 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>