commit | 2adb2e4f417a04777378f64076b33c761fc9e36c | [log] [tgz] |
---|---|---|
author | Beverly Tai <beverlyt@google.com> | Fri Apr 12 19:36:04 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 12 19:36:04 2024 +0000 |
tree | 99e0cd8690df6f4ccce2a1a66a675e00f3dcffc6 | |
parent | fa6de6ffab4143181cf2b7afd3b43eb823558d83 [diff] | |
parent | c52b2c6a2ba48598ed4638e9524548ebe57fd08e [diff] |
[automerger skipped] Merge "Never show the alternate bouncer if the primary bouncer is showing" into 24D1-dev am: c52b2c6a2b -s ours am skip reason: Merged-In I0517dc1ee5417a436c7363c4579bc695dee398a9 with SHA-1 f24eae4e47 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26926698 Change-Id: I58ba1366792de074af1a029a036b31da9c7aaa5a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>