diff options
| author | 2023-09-15 23:39:55 +0000 | |
|---|---|---|
| committer | 2023-09-15 23:39:55 +0000 | |
| commit | 8cb79e20bbf73af15180aba8da04355015360aed (patch) | |
| tree | 1dd2ced83851a1da529da39caf7aa02811637f9f /libs/androidfw/FileStream.cpp | |
| parent | 23372a762e3b0932f7c972a0ab4f0bc0133475fe (diff) | |
| parent | 208d69ed094693ba700c73bf36dd99b388a4ed42 (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: 208d69ed09 -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: I1888f5c4cc1e6b1a3e9552bc41ef86a83a3409ee
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