summaryrefslogtreecommitdiff
path: root/libs/androidfw/FileStream.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-08 13:43:17 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2025-01-08 13:43:17 -0800
commit973dfac3bd3e8525a7487a244346dbd90fc146e9 (patch)
tree5b99c630412c35dd72bf0956fb3b651b1f24008c /libs/androidfw/FileStream.cpp
parent1429198ef3102d003671d4242b63747a753f093a (diff)
parent4e534aaad637d7e8d9908117628b1ddb019c26bd (diff)
Merge "[automerger skipped] Fix: Block opening settings app on keyguard without user auth am: 4eeb65a1f6 am: 62a0881baa -s ours" into main
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions