diff options
| author | 2023-09-16 03:30:45 +0000 | |
|---|---|---|
| committer | 2023-09-16 03:30:45 +0000 | |
| commit | 354a1478532227563f4edd1741982f7226239961 (patch) | |
| tree | 46177c9a7701d44dcb37c891ce9e0694a6d66320 /libs/androidfw/FileStream.cpp | |
| parent | 55e1dae44e6ea98ae41d5e76610f7ee6edddaec4 (diff) | |
| parent | a184fd7c3ac189c063075e11284522fb3a0437e2 (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: f4f4929a4d -s ours am: a8c8808a32 -s ours am: 3fcc68b0f9 -s ours am: e2fa797776 -s ours am: c9d29c4be7 -s ours am: a184fd7c3a -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: Icc98d5e7c9159209b93afff0eafe6a685b2b2deb
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