diff options
| author | 2023-09-15 22:46:09 +0000 | |
|---|---|---|
| committer | 2023-09-15 22:46:09 +0000 | |
| commit | 761179fc4fa215ce0b938dc0f4a2d984460476ba (patch) | |
| tree | ea61edc92882f041e979741586ee6684e0005cb5 /libs/androidfw/FileStream.cpp | |
| parent | 7d1939c07b2c584935983f338ce05456c3f52b24 (diff) | |
| parent | 0084bb7961f3246fa41d223cf106616d31df0166 (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 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: Ia13c25cbd12a451f4bf9a99149d61cd4905c5021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions