diff options
| author | 2023-09-15 23:34:09 +0000 | |
|---|---|---|
| committer | 2023-09-15 23:34:09 +0000 | |
| commit | bdc0f9a3c8bf4edc37b2cfe1efe2ec13b73ebf65 (patch) | |
| tree | 1dd2ced83851a1da529da39caf7aa02811637f9f /libs/androidfw/FileStream.cpp | |
| parent | a184fd7c3ac189c063075e11284522fb3a0437e2 (diff) | |
| parent | 5e458d2d25c9d5e98f544986df747d02e964ba23 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e am: fa1f3f3cb0 am: ff53f5a273 am: eb4fd282c7 -s ours am: 5e458d2d25 -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/+/24341230
Change-Id: Idd646ba7fe628872276d94fc183c9746e46268ff
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