diff options
| author | 2023-09-16 03:32:51 +0000 | |
|---|---|---|
| committer | 2023-09-16 03:32:51 +0000 | |
| commit | 1c3e76249748debfda77b6dd95e8fa2d5f6aafbb (patch) | |
| tree | 46177c9a7701d44dcb37c891ce9e0694a6d66320 /libs/androidfw/FileStream.cpp | |
| parent | 24dcecc3e46bc750902dbec35c13d80f01a30d15 (diff) | |
| parent | 275d490690a0298acd2f7834fdcf0d4d38113ae7 (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: f9ccd8c81c -s ours am: 8bf2b51625 -s ours am: 275d490690 -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: Ia941060c19c9223fd45d9179586a16835f46a748
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