diff options
| author | 2023-09-16 03:31:47 +0000 | |
|---|---|---|
| committer | 2023-09-16 03:31:47 +0000 | |
| commit | 79837e5aaec88348a75645d7e2dc6e3f786b8efd (patch) | |
| tree | 46177c9a7701d44dcb37c891ce9e0694a6d66320 /libs/androidfw/FileStream.cpp | |
| parent | 354a1478532227563f4edd1741982f7226239961 (diff) | |
| parent | bdc0f9a3c8bf4edc37b2cfe1efe2ec13b73ebf65 (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: bdc0f9a3c8 -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: Id02c9083de4c152fdc03ac949b02f65326aa6bf3
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