diff options
| author | 2023-09-16 04:10:21 +0000 | |
|---|---|---|
| committer | 2023-09-16 04:10:21 +0000 | |
| commit | ea14f7dad181432e37c378352a4b161a1f94e7b9 (patch) | |
| tree | 46177c9a7701d44dcb37c891ce9e0694a6d66320 /libs/androidfw/FileStream.cpp | |
| parent | 1c3e76249748debfda77b6dd95e8fa2d5f6aafbb (diff) | |
| parent | edf4306330ccaf1eb6da1f00cd08934faad70a80 (diff) | |
[automerger skipped] Merge "Require permission to unlock keyguard" into rvc-qpr-dev am: 324d8033ba am: 4397e74103 am: 89a3862e5d am: 8aaad2a211 am: c4e7a6081e am: 17405aa591 am: 13f4d4f471 -s ours am: aa805d1ff6 -s ours am: 0c8f6e30a7 -s ours am: 85724d019d -s ours am: edf4306330 -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: If4155a0e05c6980b46c5ebc24d7f6dfe301bd3d4
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