commit | 1be78c0ffa559ea633744da3cd258edf3d13e607 | [log] [tgz] |
---|---|---|
author | Miranda Kephart <mkephart@google.com> | Fri Oct 04 16:36:34 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 04 16:36:34 2024 +0000 |
tree | c88be9a27088286cf4770c17f4a49a9daf78ffb4 | |
parent | a717804365210c369207d430eace1aa21f8f0f5c [diff] | |
parent | e7220c098fead7a2e1e254dd8f093915f174ea76 [diff] |
[automerger skipped] Merge "Block clipboard UI when device is locked" into tm-dev am: 12692eca76 am: 4a1101b606 -s ours am: 15cfe03139 -s ours am: 410da0db6d -s ours am: b7c0d4c52b -s ours am: e7220c098f -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: I72daf613606683ac1dd57ea9458e7b7e97da7f98 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>