tree 053d3a0ecb1c30b4448208264fbef95c6e85b8b3
parent 4024899f829f5b403f0f658a44a245d4c28fb2df
parent f7dacfdee10f71539a0cbe06671b0f082ce15371
author Matt Pietal <mpietal@google.com> 1696436788 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1696436788 +0000

[automerger skipped] Merge "Add support to configure double line clock in lockscreen [1/2]" into main am: 90693766af am: 3ed530e2df am: 095d79fa8b am: f7dacfdee1 -s ours

am skip reason: Merged-In I35d5b2807befe253ba327690fdcbc39af3bcfb37 with SHA-1 41b8da97dd is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2527300

Change-Id: I2445c71da81a151619b3b1ddd563b973fef9287b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>