diff options
| author | 2023-09-15 23:32:33 +0000 | |
|---|---|---|
| committer | 2023-09-15 23:32:33 +0000 | |
| commit | 59ee71e01db35726f3e1df3173ad7cd9c45be502 (patch) | |
| tree | 1dd2ced83851a1da529da39caf7aa02811637f9f /libs/hwui/HardwareBitmapUploader.cpp | |
| parent | 033515e8b953cb5644edcfe096a74adfbcc7efed (diff) | |
| parent | 761179fc4fa215ce0b938dc0f4a2d984460476ba (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-dev am: 78b272400f -s ours am: 30316315ae -s ours am: 8ba2179244 -s ours am: f72e484da4 -s ours am: 790fbfb359 -s ours am: 8dd736d39c -s ours am: 899dc4ee82 -s ours am: a79a951cf8 -s ours am: 0084bb7961 -s ours am: 761179fc4f -s ours
am skip reason: Merged-In I7ba7e56f954c8e6f1f734311f735215918975bc6 with SHA-1 9ef8ef1dc5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24341231
Change-Id: Iadc99131b966f8981cd7cc8b147f6f25e53bb2a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/hwui/HardwareBitmapUploader.cpp')
0 files changed, 0 insertions, 0 deletions