tree ac86cae41dd7943e302067e743e2a2ceba91a3c4
parent 4a3ff899001ff7678a8a29ab836f3c40db5b56d0
parent 8e7b8c3fd30a47a82a3662c44be48894a6bd3ad9
author Xin Li <delphij@google.com> 1702335448 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702335448 +0000

[automerger skipped] Merge Android 14 QPR1 am: 408696171a -s ours am: d2526025a2 -s ours am: 8e7b8c3fd3 -s ours

am skip reason: Merged-In I2bc03b330676413e9697494ac177fdb8fd92ff4f with SHA-1 ec577f02cd is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/modules/CaptivePortalLogin/+/2866392

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