diff options
| author | 2023-09-15 21:43:53 +0000 | |
|---|---|---|
| committer | 2023-09-15 21:43:53 +0000 | |
| commit | fb6ca21bee90eeae666e3a5c4bba9da9e7738d7d (patch) | |
| tree | 65e1358bf8c677a85c631bd0cdeaa641403da81c /libs/androidfw/FileStream.cpp | |
| parent | 2048297256564ed672e8df74d592d7bd02952d67 (diff) | |
| parent | a79a951cf8e106eced7d08c1667f167d4aa9c7b5 (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 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: I3c9bba6b19a77f7b77111b615363978d22e24552
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