tree fb0cfc38c5dc273999710c1a0c97a71843799dab
parent b2af65e35e443c1fde78e9e836601b519c12177b
parent 6c0ca0dd102c24a5bdb526356ac5f81653b01e7e
author Miranda Kephart <mkephart@google.com> 1728053948 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1728053948 +0000

[automerger skipped] Merge "Block clipboard UI when device is locked" into tm-dev am: 12692eca76 am: 6c0ca0dd10 -s ours

am skip reason: Merged-In I1a48cbe64852dce3fba69915ca11dad8878f66eb with SHA-1 01a842822a is already in history

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

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