tree e236eb12085d369c40c2c160b8300a5cfd286af9
parent fa5e4152054e1197a97f640c4f959c3eef91e652
parent 368b6f95e314ae19a076d2129b3fbfb699fa8496
author Miranda Kephart <mkephart@google.com> 1728055198 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1728055198 +0000

[automerger skipped] Block clipboard UI when device is locked am: 01a842822a -s ours am: d4414ca4f8 -s ours am: 368b6f95e3 -s ours

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

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

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